Helpers Refactors

Clone of and resolves #2107