Refactor Artisan Commands