tidied up trips model