a bit more cleanup