fixed code style and whitespace