formating
more formating and stuff
Formating and added missing stuff