Small Refactoring or whitespace, comments, and seperating View from Controller
Refractor