simple clean ups to sample chapters 2 and 3