More readability changes