Minor reformats, should be ready for PR.