(chore) #5 Code cleanup. Optimized zone modify API.