Remove whitespace changes and other cleanup