Reorganized to use OptionParser