Cleanup chapter 8 by Florian