Minor white-space tweaks