small changes
small changes
#2: id enumerable + unit test
#3 discount preprocessing