Fix formatting, so that syntax highlighting works
Merge branch 'whitespace'

Pull request #370