Refactor following stuff into concern