Move command line options to separate class