Fix CS
Improve simplicity