Try and simplify some of this a little