Updated code to comply with coding standards.