Refactoring in preparation for using multiple classification algorithms.