refactor, comments