Simplyfy address

Fixes #190