Scrutinizer cleanup