Add TODOs from code review