Add refactoring to clean zipcode