More readability improvements