Refractored Code... Finished Chapter 9!
Pfffff....