Refactor #122