better fn name, remove todo