Refactor CommandLineConstants