Extract method from self.classify
Fix merge conflict with remote branch