and a bit more cleanup