Minor readability improvements

Seems a lot more readable to me overall.