raw refactorings