Original sentence: Tony Veale, who is taking a more formalised computational approach than Koestler did, has written on the role of metaphor and metonymy in humour, using inspiration from Koestler as well as from Dedre Gentner's theory of structure-mapping, George Lakoff and Mark Johnson's theory of conceptual metaphor, and Mark Turner and Gilles Fauconnier's theory of conceptual blending
Edited sentence: Tony Veal, who is taking a more formalised computational approach than Koestler did, has written on the role of metaphor and metonymy in humour, using inspiration from Koestler as well as from Dedre Gentner's theory of structure-mapping, George Lakoff and Mark Johnson's theory of conceptual metaphor, and Mark Turner and Gilles Fauconnier's theory of conceptual blending