Cleanup. Names and doc, fixed.