cleaned up crap