more cleanup & organization