small performance change + E_NOTICE removal