Refactor trip model