Coding style changes and fixing issues found during review.