Skip to content

CLI refactoring

CLI refactoring #415