Add TODOs and correct a trivial bad practices