Sword::CLI Refactor