Fixed code review issues.