remove todo on fix formatting issues