A bit more cleanup