Code cleanup.

Fix some indent mistakes.
Minor changes.

Change dtm's story a little bit.