Readability improvements and a typo fix.