refactor/cleanup Data::Zone