Fix some style (whitespace) issues