Refactored zip to zip_code