Mostly readability improvements.