Minor coding style and whitespace changes