Minor edit.
Removed 'TODO'
Minor edits.