Correct naming typo.
Fix indent.
Reformat and add comments.