Fix formatting and white space