cleaning up
a bunch of shit