Smartsign helper refactor

As the refactor branch is now stable it is being merged into master