Clean-up some whitespace formatting issues