Clean up names and spaces