Added make file
Clean up command line argument reading