updated to meet coding standards