Cleaned up the sample, version 1.1

Cleaned up sample, version 1.1