ZLField code cleanup/improvement