refactor/comment