Fixing code review comments.