Tidied up ZoneController