applyed scrutinizer fixes