Refactor of the solution for problem 18 and 67