Changes in response to review comments from @peterflynn and @redmunds