Chapter 15 expression formatter added