56: Completed (mostly) refactoring work for Helpers
Merge pull request #65 from navssurtani/56

56: Completed (mostly) refactoring work for Helpers