Reformatted JS
JS refactorings
Refactored so that everything is now a service. Now need to make controllers less fat!