fix sample and refactoring.
fix sample.