Fix extension
Fix extension
Refactor for simplicity
Merge branch 'refactor'