Task reorg 1 cleanup

Hm I've been omitting null values but never thought about which way is better.