Some cleanup & consistent naming of sessions.
Introduced Neighbor data type & parsing for it.