refactor #1