improved scrutinizer config some more, fixed unused vars