Lint fixes.
adding zip code return stuff