Clean up a little to make vendor-cookbooks friendly