A number of further revisions in response to code review