hw models - cli refactoring