refactor concerns