Move Embellishment to Decorator

Code provides an embellishment to a class’ core responsibility.

Move the embellishment code to a Decorator.