Updated for coding standards.