Small improvements to readability