Cleaned up address fields