Another step towards making BookCalculation immutable