Simple clean ups to sample chapter 2