Tidy up name and whitespace.