refactor(#71): CLI refactor and minor improvements