Add TODO memo + cosmetics

Change-Id: If0e82e42893a8cb5e04087622f727d1fd8df5210
7 files changed