Updated to meet coding standards