a tiny bit more cleanup