Sort out Zones.cpp code formatting

.. I know its a matter of taste, but some of the formatting in there
   would win the OCCC competition. I mean FFS, who puts else clauses
   after a ';' !?

.. the formatting probably reflected the different people who have
   updated the code over the years.

.. no functional changes whatsoever in this commit -- just cleaning
   the source code to make it more maintainable (and readable)