Cleaned up a bunch of things