Classify concern refactor