fix whitespace and coding style