more cleanup

clean*ish