Cleanup scrutinizer comments