A little bit more cleanup