refactor, comments.