A little cleaning on samples