Fixed a few code review comments.