Code formatting
Changed somany things that I cannot remember what has been changed or
not