refactor refs #189