Revert "changed addresses to arrays"

This reverts commit 2c0c5c3ac9b922b8904622f9cd3a96d59ba36891.