step-03 solution - refactor
Merge branch 'step-04' into step-04b
Merge branch 'step-04b' into step-05