minor updates to comments and formatting