Review: code cleanup + alignment
Review; Adding three states on task in stead of
true, false, null