Fixing code review