Some clean-up and reformatting.