Solution Refactor