updates to improve scrutinizer results