Minor changes to CodeNeighbourhood