cleaning and white space change