Refactor #22