refactor interactors
Merge pull request #642 from guard/rework_interactors

refactor interactors