cli refactoring and porcelain mode