review refactorings