Trivial readability improvements