minor refactoring.
Revert "minor refactoring."

This reverts commit 871c0c8ec31cfbff0c98fa34bb251aea39a1c64d.
minor refactoring.