Tidy up

Tidy up code, Fix lines