a bit of tidying up - chainsaw style !