Cleaning up Address editing