Some commenting on controller and view
More comments and refactoring