Applied first code review revisions