refactor #98