Remove outdated TODO note, fixed some indentation issues.