Undid SOME of the stupid Eclpise formatting