updated to meet coding standards (part II)