Remove/refactor the descriptions.
More refactoring, get lines below 80 chars.
Fix missing comment, pull up a few lines.