Ch 6 main class cleaned up
Merge remote-tracking branch 'origin/master'