More stream-lined approach in the command line