More samples and small changes
Refactor and clean