more cleanup + fix