Refactor #15