fix CS issues