trip refactor