Try to improve the Scrutinizer ranking by further refactoring