Cosmetic changes in TODO