Fix todos and comment