Small tidy up, some lines reversed