Add whitespace and explanatory comments.  We may have to refactor this to use promises instead of events. The indirection could be confusing.