Refactor according to specinfra#149