Improved code readability and performance