@ohadlevy, agreed.  Will refactor.