doing a bit more cleanup