Minor refactor
Classifier trainer seems to work now