Some more comments
Minor cleanup