Improved performance and readability of code