add a TODO and fixed a repetition