Clean up of sample code