organization & more cleanup