RF: adding coheneta to goodness of fit, cleaning code