Fix scrutinizer advices
Fix CS