fixing more scrutinizer issues
fixing more issues