code review, refactoring