Some cleanups, shit i dunno