CLI read: refactoring.