Refactor #2