Readability improvements

Minor improvements to readability