Small refactor and change to command-line output