Moved some logic into the Model
Changed the name of a method to better reflect it's function