Cleanup, modified SampleC