Refactors combining addresses 2 and 3

Small refactor.

cc @csaunders