CLI improvement. A little abstraction.