Refactor #20