Collapse neighbor cell lookup into one method