Applying more code review comments