Cleaning up code based on code review feedback