Clean up
Use getopt_long for arg parsing