fixing CS violations