More spacing tweaks on what we do