Add output control
Use more concise module import pattern
Separate CLI concerns