Moved code to zipcode model
Refactored and simplified how much code is repeated throughout