Do some minor code reformatting to apply to coding standards.