Cookbook cleanup and refactoring.