little cleanup, but that's still SO dirty