cleaned up a bunch of shit