[CS] Code Style fixes. Closes #4277, closes #4304, closes #4305