fix and clean sample