Skeletal getopt() usage
Slight cleanup
Slight cleanup