Small coding-style fixes

Fixed curly brackets at a few class definitions