improvements suggested by pullreview.com