Minor clean up of samples