cleaned up the crap