CS
Refactor a bit more