Change per suggestions by scrutinizer-ci.com