more updates to improve code quality on scrutinizer