Minor code cleanup
Minor doc changes