Cleanup suggested by @raggi.
Merge pull request #74 from adstage-david/pipeline_fix

Additional Cleanup suggested by @raggi on #73