add suggested refactorings