A little bit of cleanup