Make the officials dependency optional (for now)
White space change
Formatting tweaks