crap cleaned up