Refactor

/cc @opscode-cookbooks/release-engineers