[CS] Just fixing some CS issues [#7]