Simplification using getopt