Cleaned up strategy pattern code a bit more.
Additional cleanup in decorator and factory method patterns.