Refactor solutions