#19 reformatting
Tidy up