Revert "minor refactoring"

This reverts commit 66f61737c44710e1b88e513b620595725a4d8170.
FIX