Refactor

/cc @opscode-cookbooks/release-engineers 
This is now maintained by Opscode, right?