- CS, simplify code