Added author annotations, did other cleanup.  This is part of response to code review, see #44.