Initial clean up formatting in controller files