Refactor ORB