Cleaning up white spaces