Cleaned up Task model.