Refactor + chefspec3 upgrade