address/make: improve code