final refactoring on trip service