Update TODO comments.
Code style fixes.