Simplify task a bit