Updated for scrutinizer
Fixed notices