[codereview, refactoring]