Formatted all files to the same standard

Formatted using eclipse, all files should now have the same formatting standard