Fixed curly brackets at a few class definitions
Merge pull request #1267 from djbobke/coding-style-fixes

Small coding-style fixes