Improved coding standards.

Improved coding standards.