cosmetic changes - added TODO