Minor cleanup and readability improvements.