Fix comment and CS issues.