Did some base level cleanup.