Spacing clean up