refactor the solution in service lane challenge