apply scrutinizer suggestions