Workflow refactor and decrease complexity
Merge pull request #5 from kodify/decrease_workflow_complexity

Workflow refactor to decrease complexity