Final scrutinizer comment fixes