Fixed linker errors
Refactored command line arguments