Refactored part of the code, and added new command line options