The trip - refactor