Some reformatting and clean-up