tried to refactor with future proof styles, needs more adjustment
Revert "tried to refactor with future proof styles, needs more adjustment"

This reverts commit 2498de84b1ae27802d67cf664253d0282f87104e.
fixed refactoring issues