Readability and style improvements