Code Cleaning
Modified the main class to accept agruments