Just cleaning up a few things