Refactor #13