Factory was replaced with builder.
Fixed name of method and added appropriate comments.
Decorator was replaced with validator.