refactor #171