Some nice cleanup