Simplify scenario
More logical arrangement of steps
Remove unnecessary branch checkout
address comments