Minor reformatting with OptionParser