Documentation updates.
Minor code cleanup