Refactoring the Code

Objectives

We would like to :
  1. Clean up the main function just a bit.

Notes