Simplify this a bit