Whitespace cleanup and getting the cookbook version in sync.