cleaned a bunch of things up, test test test