Removed class variables and changed them to costants. Added code to support city and state lookup from the existing postal code model.