Neaten untidy code - still horrible

Neaten untidy code - still horrible