Refactor main controller, less procedural, more object oriented