start to cleanup code
Merge branch 'predictors' of github.com:renepickhardt/typology into predictors