Cleanup of sample_utils.py