Code style tweaks involving the "private" keyword

"private" statements should:
- Have an empty line before and after them.
- Keep code below them at the same indent level.
Merge branch 'dev' into feature/config-updates