simplifying sample
Refactoring, simplifying.