cleaned up a lot of things