cosmetic.
refactoring the lexicon
trying to unify all feature engineering.
more feature refactoring.
more refactoring.