Taking care of the code review comments.