Cleanup, a few more useful functions