Tackle pull review issues

fix some of the [pull_review report issues](https://www.pullreview.com/github/24pullrequests/24pullrequests/reviews/master)