refactor address list

@jeremy @bf4 @mikel 
:+1: