No issue: make curly brace/++/-- usage consistent

Improve usage of curly braces, ++/-- and variable declarations to match style guide.