Refactor Neighbourhoodutil