Change per suggestions from scrutinizer-ci.com