Refactor Solution
Refactor Solution