concerns refactor