address round 1 comments

Will be squashed after lgtm