[CS] Minor improvements to readability

- Better order for use statements
- Alignement