Slight readability improvements