Add TODO and XXX annotations for improving code