refactor, comment