More readability updates