rename badly named method
more cleanup