Cleanup imports, style and licencing.

Updated TODO list.

Change-Id: Ic8f683fb973365ddf4d16a5c27494ddb32b13372