Normalize address on update
Remove TODOs
Move address normalization into the add service to reduce code duplication