same function same form same super class
more cleanup
Merge pull request #8 from Genshin/refactor_extended

Refactor extended