Reformat and clean up
Merge pull request #142 from fernandoacorreia/cleanup-braces

Reformat and clean up