Update to meet coding standards