Refactor #148