Just a little bit more cleanup