Reorder some things. Also, tabs -> spaces.

Includes removing some trailing spaces.
Add description, newline at EOF.