Refactoring Sol