PSR-2 reformat, scrutinizer cleanup