refactor, improve org-ezs