Formated everything

Got annoyed by the formating and how it was all messed up.