refactoring match classes check