Clean code, add test
Merge branch 'iba_86_feedback' into staging

* iba_86_feedback:
  Clean code, add test