Cleaning up unnecessary module import
Adding raw output option.