correct comment + remove TODO