Fix missing curly braces and adjust some formatting.
Merge pull request #561 from tensafefrogs/next

Fix missing curly braces and adjust some formatting.