cleaning up my usual crap