cs cleanup

just cs fixes.