Refactor CommandLineRunner