Improve code to fulfill coding standards.