fix whitespace and name