Style fixes and merge with Ryley's new PR
Style fixes and merge with Ryley's new PR

kschecht/sarif-sdk,kschecht/sarif-sdk,kschecht/sarif-sdk,kschecht/sarif-sdk,kschecht/sarif-sdk,kschecht/sarif-sdk,kschecht/sarif-sdk