Editorial revisions based on dev feedback 

Mostly line length and indentation.