cleaned up task model