Code readability improvements.