[CS] Minor improvements to readability