Minor sample cleanup...