Scrutinizer refactoring