Fix cs to comply with PSRs rules