Commenting, cleanup. Refs #29