General cleanup according to style guide.
General cleanup and API CCN report.