Exercise 2.3: fix bug (unused a parameter)
Exercise2.4: use CPS.