Clean up utils/get-sample a bit