Minor clean-ups and reformatting.