Refactor according to specinfra#149

serverspec/specinfra#149