Streamlined and Finished Neighbor Code