Fixed CS issues^2