Polishing

I would use 'notFound' instead of defVal to keep the consistency.