More refactoring
Merge branch 'master' of https://github.com/tech-team/case-finder