Further clean up
Modified sample