Cleaning up code, move some to Ch 10