Improved readability and increased strictness