small code cleanup for cypher queries