cleaning up a few things