Coding standards and minor cleanup.