Comment, refactor, and test model methods and refactor controller