Clean up some white-space