Minor stylistic clean-ups and more symmetry