Update TODO
Minor simplification for implicit return