Fixed clear, so it returns undefined.
Minor tweaks.