Tidy formatting
a little more tidy