Refactor, now use objects to manage data structures