Reformat and Whitespace cleanup