Namespace cleanup: code style: white-space adjustments