[CS] Codestyle changes done in staging.