Improve readability and performance