clean + fix bug in Main class (should exit when args !=2)