slight cleanup again