Refactoring Session - first wave
Refactoring Session - first wave