Revert "refactoring"

This reverts commit fa3f338caffca171be429f17166f6907edc847ea.