Move, comment, and refactor