Fixed code review comments.