Refactor how ch 9 organized