cleaned up code working on editing trip