scrutinizer refactoring