Just cleaning some part of Chapter 18 and Chapter 23