Cleanup to reduce boilerplate code in samples