Formatting improvements for samples.