Refactoring sample
Refactoring base code completed