Minor stilistic clean-ups and more symmetry