refactored and removed old version of solve

refactored code slightly and removed old version of solve and renamed
solve2 to solve
tested and all results still good (7,3,7,7,7,7[38/60])