Refactor
Refactor #2