Fixing code review suggestions