Improved code quality for Scrutinizer