Refactor #19