Refactoring
Solution Refactoring