Ariel suggestions/edits.

[arokem]

This diff seems larger than it actually is, because my text editor strips white space at the end of lines.