Cleanups as of scrutinizer inspections