Reformat, tidy everything up. Last commit of today!