fix whitespace
clean up code