CypherSpider code cleanup