Fix a couple of the more egregious formatting issues