Some refinements on design and language

This changes were requested here: https://github.com/neighborly/neighborly/pull/104