Cleaning up crf/feature engineering