refactor/comments