clean a few things up