simplify orga code