updated refactorings