refactor MulticlassWrapper a bit