Modified code to comply with code standards.