more cleanup and naming