text refactorings, CS fix