More clean up and doc.