cleaning some sloppy things up