Refactor/cleanup the helper to add the ability to write a manifest file