Refactor Solutions