Add Labels class for easy retrieval of zone, etc labels.

Refactoring and minor cleanup.