Edits in response to comments on PR#220