Improved performance, readability