Very slight cleanup