Change layout to match Cookbook-hs and Cookbook-lisp. Remove debugging code.