Some slight cleanup