Fix indentation and properly format TODOs

Indentation issue spotted by Niklas in Change-Id:
Icca878d9b01f8e6b228ffdff6f9bc7412a5608c9

Change-Id: I6bef6af55666d1d6189c5ec2be964695a8fc0c07
Merge "Fix indentation and properly format TODOs"