white space and code cleanup