minor refactoring for oracle handler