Make code easier to read
Tidy up code