Minor cleanup of Cypher