White Space Clean up