Code refactor - move functionality of finding cell neighbours and candidates to revive outsite the methods