Casual refactoring to make less jq objects
fixup linting