Modifications based on code review