Cleaning up some white space