Improved accuracy and readability.