Fix CS
Add explicit comments