small cs cleanup