refactor according comment