refactor #181