Updated for scrutinizer issues