56: Completed (mostly) refactoring work for Helpers