Clean up formatting and make an app variable
Clean up controllers file
Clean up directives file
Clean up filters file
Clean up services file