bit more cleanup