Make sample a little cleaner