Updated code to match coding standards.