cleaned up a bunch of stuff