Use new helper library.  Code cleanup.