Improved readability and formatting