Helpers Refactors

Clone of and resolves #2107 
WHY WOULD THEY DO SUCH A HORRIBLE THING?!