messing with data and fixed clean function