Restructure code to setup and tear down zone variables