[2.2] Cypher - Refactor code to make it easy to do dependency injection