Minor formatting tweaks amidst security audit

In the process of making this merge request I would consider the code to pass the provisional release security audit. No offending code was found.