Readability and efficiency improvements