Minor changes to the chapter organization