Large cleanup to make cookbook usable