CalcAdjacencies looks cleaner now