Cleanup names and whitespace