Move Embellishment To Decorator

Problem:

Code provides an embellishment to a class' core responsibility.

Solution:

Move the embellishment code to a Decorator.