cs fixes applied