Slight refactoring, improved scrutinizer config