Clean task model up a bit