reformat

I had a look around and got confused, then I saw the use of some of
this. :p