clean up of sample code and comments.