Changes according to code review comments.