Modifications after code review