Bringing things up to date.
Moved up defval to variable.
Moved up trim() on label.