Add TODO and code cleaning.