Refactoring after code review