Refactor, comments.