refactor according to review