Comments & minor cleanup