WSOTWO-126: Clean code of Address Endpoint class