Code cleanup and comments updates.  Updated readme.