Move helper functions into the class to allow future customization
Move helper functions into the class to allow future customization

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt