Style fixes for #298

(mostly indentation and whitespace)