Major white space cleanup