Added brackets even to single statement blocks,
applied clang-format.

Brackets for blocks helps with GCOV coverage reports.