Organizing Zone class, minor formatting changes.