Refactor and neighbour checking