cleanup and stuff
more clean
oops™