Code refactor and more samples.