performed next refactoring