refactored optional location command line options