Extract option parser methods
Merge branch 'extract_option_parser_methods'