Tiny bit more cleanup