Improving readability of cypher.