refactor & concern