more cleanup + fix my mistake