Improved performance and readability.