address/make: refactor code a bit