Refactoring solutions