Refactor patterns - Part #1
Refactor patterns - Part #2