tidy up of whitespace / fix white space regression