Updated to add in a command line option to specify output style