correct indentations.

Also can you write TODO's as TODO(vikesh): So we can tell who had put the TODO.