Get rid of tabs and tidy up formatting a little.