Refactor Oozie