diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore
new file mode 100644
index 000000000..1b998f3ec
--- /dev/null
+++ b/.ansible-lint-ignore
@@ -0,0 +1,7 @@
+workflows/docs.yml yaml[truthy]
+workflows/docs.yml yaml[new-line-at-end-of-file]
+workflows/docs.yml yaml[line-length]
+workflows/docs.yml yaml[new-line-at-end-of-file]
+workflows/sanity_tests.yml yaml[truthy]
+workflows/ansible-lint.yml yaml[new-line-at-end-of-file]
+.github/workflows/ansible-lint.yml yaml[new-line-at-end-of-file]
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
new file mode 100644
index 000000000..95e3e35a0
--- /dev/null
+++ b/.github/workflows/ansible-lint.yml
@@ -0,0 +1,18 @@
+# .github/workflows/ansible-lint.yml
+name: ansible-lint
+on:
+  pull_request:
+    branches: ["main", "stable", "release/v*"]
+jobs:
+  build:
+    name: Ansible Lint # Naming the build is important to use it as a status check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@main
+        with:
+          args: ""
+          setup_python: "true"
+          working_directory: ""
+          requirements_file: ""
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 4498aadb5..d2724a330 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -29,13 +29,14 @@ jobs:
         run: make doc
       - name: commit docs
         run: |
-          git checkout gh-pages
+          git checkout gh-pages || git checkout -b gh-pages
           rm -rf $(basename ${GITHUB_REF})
           mv docs/_build/html $(basename ${GITHUB_REF})
           git show origin/main:docs/_gh_include/header.inc > index.html
           (echo main; dirname v*/index.html | sort --version-sort --reverse) \
             | xargs -I@@ \
-            -n1 echo '<div class="col-md-4 center"><a href="@@/" class="btn-doc btn"><i class="fa fa-newspaper-o"></i><p>@@</p></a></div>' >> index.html
+            -n1 echo '<div class="col-md-4 center"><a href="@@/" class="btn-doc btn">' \
+            '<i class="fa fa-newspaper-o"></i><p>@@</p></a></div>' >> index.html
           git show origin/main:docs/_gh_include/footer.inc >> index.html
           git add $(basename ${GITHUB_REF}) index.html
           git commit -m "update docs for $(basename ${GITHUB_REF})" || true
diff --git a/.github/workflows/sanity_tests.yml b/.github/workflows/sanity_tests.yml
index a6d55c4a2..9347bc934 100644
--- a/.github/workflows/sanity_tests.yml
+++ b/.github/workflows/sanity_tests.yml
@@ -1,13 +1,13 @@
 name: CI
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
   schedule:
     - cron: '0 6 * * *'
 env:
   NAMESPACE: cisco
-  COLLECTION_NAME: meraki 
+  COLLECTION_NAME: meraki
 jobs:
   sanity:
     name: Sanity (Ⓐ${{ matrix.ansible }})
@@ -37,4 +37,4 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color
-        working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
\ No newline at end of file
+        working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
diff --git a/README.md b/README.md
index 2ca3ab8f9..e93447b62 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,8 @@ meraki_server
 Create a playbook `who_am_i.yml` ([example](https://github.com/meraki/dashboard-api-ansible/blob/main/playbooks/who_am_i.yml)):
 ```
 ---
-- hosts: meraki_servers
+- name: Play Name
+  hosts: meraki_servers
   gather_facts: false
   tasks:
     - name: Get my administered identities
@@ -139,10 +140,10 @@ The modules that were there before, usually with a `meraki` prefix, are maintain
 ```
   - name: Create webhook
     cisco.meraki.networks_webhooks_http_servers:
-      meraki_api_key: "{{meraki_api_key}}"
+      meraki_api_key: "{{ meraki_api_key }}"
       state: present
       name: Test_Hook
-      networkId: "{{network_id}}"
+      networkId: "{{ network_id }}"
       payloadTemplate:
         name: Slack (included)
         payloadTemplateId: wpt_00001
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index b55b66afb..1b082df3a 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -3,963 +3,963 @@ releases:
   2.0.0:
     changes:
       breaking_changes:
-      - meraki_device - Changed tags from string to list
-      - meraki_device - Removed serial_lldp_cdp parameter
-      - meraki_device - Removed serial_uplink parameter
-      - meraki_intrusion_prevention - Rename whitedlisted_rules to allowed_rules
-      - meraki_mx_l3_firewall - Rule responses are now in a `rules` list
-      - meraki_mx_l7_firewall - Rename blacklisted_countries to blocked_countries
-      - meraki_mx_l7_firewall - Rename whitelisted_countries to allowed_countries
-      - meraki_network - Local and remote status page settings cannot be set during
-        network creation
-      - meraki_network - `disableRemoteStatusPage` response is now `remote_status_page_enabled`
-      - meraki_network - `disable_my_meraki_com` response is now `local_status_page_enabled`
-      - meraki_network - `disable_my_meraki` has been deprecated
-      - meraki_network - `enable_my_meraki` is now called `local_status_page_enabled`
-      - meraki_network - `enable_remote_status_page` is now called `remote_status_page_enabled`
-      - meraki_network - `enabled` response for VLAN status is now `vlans_enabled`
-      - meraki_network - `tags` and `type` now return a list
-      - meraki_snmp - peer_ips is now a list
-      - meraki_switchport - `access_policy_number` is now an int and not a string
-      - meraki_switchport - `tags` is now a list and not a string
-      - meraki_webhook - Querying test status now uses state of query.
+        - meraki_device - Changed tags from string to list
+        - meraki_device - Removed serial_lldp_cdp parameter
+        - meraki_device - Removed serial_uplink parameter
+        - meraki_intrusion_prevention - Rename whitedlisted_rules to allowed_rules
+        - meraki_mx_l3_firewall - Rule responses are now in a `rules` list
+        - meraki_mx_l7_firewall - Rename blacklisted_countries to blocked_countries
+        - meraki_mx_l7_firewall - Rename whitelisted_countries to allowed_countries
+        - meraki_network - Local and remote status page settings cannot be set during
+          network creation
+        - meraki_network - `disableRemoteStatusPage` response is now `remote_status_page_enabled`
+        - meraki_network - `disable_my_meraki_com` response is now `local_status_page_enabled`
+        - meraki_network - `disable_my_meraki` has been deprecated
+        - meraki_network - `enable_my_meraki` is now called `local_status_page_enabled`
+        - meraki_network - `enable_remote_status_page` is now called `remote_status_page_enabled`
+        - meraki_network - `enabled` response for VLAN status is now `vlans_enabled`
+        - meraki_network - `tags` and `type` now return a list
+        - meraki_snmp - peer_ips is now a list
+        - meraki_switchport - `access_policy_number` is now an int and not a string
+        - meraki_switchport - `tags` is now a list and not a string
+        - meraki_webhook - Querying test status now uses state of query.
       bugfixes:
-      - Remove unnecessary files from the collection package, significantly reduces
-        package size
-      - meraki_admin - Fix error when adding network privileges to admin using network
-        name
-      - meraki_switch_stack - Fix situation where module may crash due to switch being
-        in or not in a stack already
-      - meraki_webhook - Proper response is shown when creating webhook test
+        - Remove unnecessary files from the collection package, significantly reduces
+          package size
+        - meraki_admin - Fix error when adding network privileges to admin using network
+          name
+        - meraki_switch_stack - Fix situation where module may crash due to switch being
+          in or not in a stack already
+        - meraki_webhook - Proper response is shown when creating webhook test
       major_changes:
-      - Rewrite requests method for version 1.0 API and improved readability
-      - meraki_mr_rf_profile - Configure wireless RF profiles.
-      - meraki_mr_settings - Configure network settings for wireless.
-      - meraki_ms_l3_interface - New module
-      - meraki_ms_ospf - Configure OSPF.
+        - Rewrite requests method for version 1.0 API and improved readability
+        - meraki_mr_rf_profile - Configure wireless RF profiles.
+        - meraki_mr_settings - Configure network settings for wireless.
+        - meraki_ms_l3_interface - New module
+        - meraki_ms_ospf - Configure OSPF.
       minor_changes:
-      - meraki - Add optional debugging for is_update_required() method.
-      - meraki_admin - Update endpoints for API v1
-      - meraki_alert - Manage network wide alert settings.
-      - meraki_device - Added query parameter
-      - meraki_intrusion_prevention - Change documentation to show proper way to clear
-        rules
-      - meraki_malware - Update documentation to show how to allow multiple URLs at
-        once.
-      - meraki_mx_l2_interface - Configure physical interfaces on MX appliances.
-      - meraki_mx_uplink - Renamed to meraki_mx_uplink_bandwidth
-      - meraki_ssid - Add `WPA3 Only` and `WPA3 Transition Mode`
-      - meraki_switchport - Add support for `access_policy_type` parameter
+        - meraki - Add optional debugging for is_update_required() method.
+        - meraki_admin - Update endpoints for API v1
+        - meraki_alert - Manage network wide alert settings.
+        - meraki_device - Added query parameter
+        - meraki_intrusion_prevention - Change documentation to show proper way to clear
+          rules
+        - meraki_malware - Update documentation to show how to allow multiple URLs at
+          once.
+        - meraki_mx_l2_interface - Configure physical interfaces on MX appliances.
+        - meraki_mx_uplink - Renamed to meraki_mx_uplink_bandwidth
+        - meraki_ssid - Add `WPA3 Only` and `WPA3 Transition Mode`
+        - meraki_switchport - Add support for `access_policy_type` parameter
       security_fixes:
-      - meraki_webhook - diff output may show data for values set to not display
+        - meraki_webhook - diff output may show data for values set to not display
     fragments:
-    - add-build-ignore.yml
-    - diff_secret_fix.yml
-    - is_update_debug.yml
-    - malware_docs.yml
-    - malware_mx_l2_interface.yml
-    - meraki_admin.yml
-    - meraki_alert.yml
-    - meraki_content_filtering.yml
-    - meraki_device.yml
-    - meraki_firewalled_services.yml
-    - meraki_intrusion_prevention.yml
-    - meraki_malware.yml
-    - meraki_management_interface.yml
-    - meraki_mr_l3_firewall.yml
-    - meraki_mr_rf_profile.yml
-    - meraki_mr_settings.yml
-    - meraki_ms_l3_interface.yml
-    - meraki_ms_ospf.yml
-    - meraki_mx_l3_firewall.yml
-    - meraki_mx_l7_firewall.yml
-    - meraki_mx_uplink.yml
-    - meraki_nat.yml
-    - meraki_network_update.yml
-    - meraki_site_to_site_vpn.yml
-    - meraki_snmp.yml
-    - meraki_ssid.yml
-    - meraki_static_route.yml
-    - meraki_switch_stack.yml
-    - meraki_switch_storm_control.yml
-    - meraki_switchport.yml
-    - meraki_syslog.yml
-    - meraki_vlan.yml
-    - meraki_webhook.yml
-    - requests-rewrite.yml
-    - ssid-tags-fix.yml
-    - ssid_wpa3.yml
-    release_date: '2020-08-27'
+      - add-build-ignore.yml
+      - diff_secret_fix.yml
+      - is_update_debug.yml
+      - malware_docs.yml
+      - malware_mx_l2_interface.yml
+      - meraki_admin.yml
+      - meraki_alert.yml
+      - meraki_content_filtering.yml
+      - meraki_device.yml
+      - meraki_firewalled_services.yml
+      - meraki_intrusion_prevention.yml
+      - meraki_malware.yml
+      - meraki_management_interface.yml
+      - meraki_mr_l3_firewall.yml
+      - meraki_mr_rf_profile.yml
+      - meraki_mr_settings.yml
+      - meraki_ms_l3_interface.yml
+      - meraki_ms_ospf.yml
+      - meraki_mx_l3_firewall.yml
+      - meraki_mx_l7_firewall.yml
+      - meraki_mx_uplink.yml
+      - meraki_nat.yml
+      - meraki_network_update.yml
+      - meraki_site_to_site_vpn.yml
+      - meraki_snmp.yml
+      - meraki_ssid.yml
+      - meraki_static_route.yml
+      - meraki_switch_stack.yml
+      - meraki_switch_storm_control.yml
+      - meraki_switchport.yml
+      - meraki_syslog.yml
+      - meraki_vlan.yml
+      - meraki_webhook.yml
+      - requests-rewrite.yml
+      - ssid-tags-fix.yml
+      - ssid_wpa3.yml
+    release_date: "2020-08-27"
   2.1.0:
     modules:
-    - description: Manage alerts in the Meraki cloud
-      name: meraki_alert
-      namespace: ''
-    - description: Configure MX layer 2 interfaces
-      name: meraki_mx_l2_interface
-      namespace: ''
-    release_date: '2020-10-16'
+      - description: Manage alerts in the Meraki cloud
+        name: meraki_alert
+        namespace: ""
+      - description: Configure MX layer 2 interfaces
+        name: meraki_mx_l2_interface
+        namespace: ""
+    release_date: "2020-10-16"
   2.1.1:
     changes:
       bugfixes:
-      - meraki_management_interface - Fix crash when modifying a non-MX management
-        interface.
+        - meraki_management_interface - Fix crash when modifying a non-MX management
+          interface.
     fragments:
-    - management_ms_fix.yml
-    release_date: '2020-11-02'
+      - management_ms_fix.yml
+    release_date: "2020-11-02"
   2.1.2:
     changes:
       bugfixes:
-      - Remove test output as it made the collection, and Ansible, huge.
+        - Remove test output as it made the collection, and Ansible, huge.
     fragments:
-    - size_fix.yml
-    release_date: '2020-11-04'
+      - size_fix.yml
+    release_date: "2020-11-04"
   2.1.3:
     changes:
       bugfixes:
-      - meraki_device - Support pagination. This allows for more than 1,000 devices
-        to be listed at a time.
-      - meraki_network - Support pagination. This allows for more than 1,000 networks
-        to be listed at a time.
+        - meraki_device - Support pagination. This allows for more than 1,000 devices
+          to be listed at a time.
+        - meraki_network - Support pagination. This allows for more than 1,000 networks
+          to be listed at a time.
     fragments:
-    - pagination.yml
-    release_date: '2020-12-16'
+      - pagination.yml
+    release_date: "2020-12-16"
   2.10.0:
     changes:
       minor_changes:
-      - meraki_network - Add support for `copy_from_network_id`.
+        - meraki_network - Add support for `copy_from_network_id`.
     fragments:
-    - 335-net_copy.yml
-    - rename_method.yml
-    release_date: '2022-07-06'
+      - 335-net_copy.yml
+      - rename_method.yml
+    release_date: "2022-07-06"
   2.10.1:
     changes:
       minor_changes:
-      - Change shebang in Sublime utils to point to env instead of direct to the path
+        - Change shebang in Sublime utils to point to env instead of direct to the path
     fragments:
-    - changelog-frags.yml
-    - sublime-utils.yml
-    release_date: '2022-07-16'
+      - changelog-frags.yml
+      - sublime-utils.yml
+    release_date: "2022-07-16"
   2.11.0:
     changes:
       minor_changes:
-      - Add GPLv3 license. Always was GPLv3, but didn't have the file.
-      - Change shebang in Sublime utils to point to env instead of direct to the path
-      - meraki_alert - Change type for opbject to alert_type in examples
-      - meraki_ms_access_policies - New module to create, delete, update Access Policies
-        in the Switch settings
-      - meraki_ssid - Add support for `ap_availability_tags`.
-      - meraki_ssid - Add support for `available_on_all_aps`
-      - meraki_ssid - Add support for `lan_isolation_enabled`.
-      - meraki_ssid - Add support for `visible`.
+        - Add GPLv3 license. Always was GPLv3, but didn't have the file.
+        - Change shebang in Sublime utils to point to env instead of direct to the path
+        - meraki_alert - Change type for opbject to alert_type in examples
+        - meraki_ms_access_policies - New module to create, delete, update Access Policies
+          in the Switch settings
+        - meraki_ssid - Add support for `ap_availability_tags`.
+        - meraki_ssid - Add support for `available_on_all_aps`
+        - meraki_ssid - Add support for `lan_isolation_enabled`.
+        - meraki_ssid - Add support for `visible`.
     fragments:
-    - add-meraki_ms_access_policy.yml
-    - alert_examples.yml
-    - amend_meraki_network.yml
-    - changelog-frags.yml
-    - license.yml
-    - meraki_mr_ssid.yaml
-    - meraki_mr_ssid_availability_tags.yaml
-    - meraki_mr_ssid_lan_isolation.yaml
-    - shebang.yml
-    - ssid_test_fix.yml
-    - sublime-utils.yml
-    release_date: '2022-09-12'
+      - add-meraki_ms_access_policy.yml
+      - alert_examples.yml
+      - amend_meraki_network.yml
+      - changelog-frags.yml
+      - license.yml
+      - meraki_mr_ssid.yaml
+      - meraki_mr_ssid_availability_tags.yaml
+      - meraki_mr_ssid_lan_isolation.yaml
+      - shebang.yml
+      - ssid_test_fix.yml
+      - sublime-utils.yml
+    release_date: "2022-09-12"
   2.12.0:
     changes:
       bugfixes:
-      - Update defaults in documentation for new sanity tests
-      - meraki_device - Fix URL for LLDP and CDP lookups
+        - Update defaults in documentation for new sanity tests
+        - meraki_device - Fix URL for LLDP and CDP lookups
       major_changes:
-      - meraki_webhook_payload_template - New module
+        - meraki_webhook_payload_template - New module
     fragments:
-    - 2.15-docs.yml
-    - 2.15-prep.yml
-    - device_lldp.yml
-    - fix-meraki-mr-radio-tests.yml
-    - meraki_ms_switch_pollicy_doc.yml
-    - meraki_webhook_payload_template.yml
-    - warnings-.yml
-    - warnings-meraki_action_batch.yml
-    - warnings-meraki_admin.yml
-    - warnings-meraki_alert.yml
-    - warnings-meraki_config_template.yml
-    - warnings-meraki_device.yml
-    - warnings-meraki_management_interface.yml
-    - warnings-meraki_mr_l3_firewall.yml
-    - warnings-meraki_mr_radio.yml
-    - warnings-meraki_mr_rf_profile.yml
-    release_date: '2022-11-21'
+      - 2.15-docs.yml
+      - 2.15-prep.yml
+      - device_lldp.yml
+      - fix-meraki-mr-radio-tests.yml
+      - meraki_ms_switch_pollicy_doc.yml
+      - meraki_webhook_payload_template.yml
+      - warnings-.yml
+      - warnings-meraki_action_batch.yml
+      - warnings-meraki_admin.yml
+      - warnings-meraki_alert.yml
+      - warnings-meraki_config_template.yml
+      - warnings-meraki_device.yml
+      - warnings-meraki_management_interface.yml
+      - warnings-meraki_mr_l3_firewall.yml
+      - warnings-meraki_mr_radio.yml
+      - warnings-meraki_mr_rf_profile.yml
+    release_date: "2022-11-21"
   2.13.0:
     changes:
       major_changes:
-      - meraki_mr_l7_firewall - New module
+        - meraki_mr_l7_firewall - New module
     fragments:
-    - meraki_mr_l7_firewall.yml
-    release_date: '2022-11-21'
+      - meraki_mr_l7_firewall.yml
+    release_date: "2022-11-21"
   2.14.0:
     changes:
       bugfixes:
-      - Fix checkmode on merak webhook payload template update
-      - meraki_webhook - First error when updating URL in a webhook
+        - Fix checkmode on merak webhook payload template update
+        - meraki_webhook - First error when updating URL in a webhook
       minor_changes:
-      - meraki_webhook - Add payload template parameter
+        - meraki_webhook - Add payload template parameter
     fragments:
-    - bugfixes-meraki_webhook_payload_template.yml
-    - warnings-meraki_mr_settings.yml
-    - warnings-meraki_ms_access_list.yml
-    - warnings-meraki_ms_storm_control.yml
-    - webhook-diff.yml
-    - webhook-plus-payload-templates.yml
-    release_date: '2023-01-05'
+      - bugfixes-meraki_webhook_payload_template.yml
+      - warnings-meraki_mr_settings.yml
+      - warnings-meraki_ms_access_list.yml
+      - warnings-meraki_ms_storm_control.yml
+      - webhook-diff.yml
+      - webhook-plus-payload-templates.yml
+    release_date: "2023-01-05"
   2.15.0:
     changes:
       bugfixes:
-      - Resolved issue
-      - Update pipeline to use newer version of action to detect changed files.
-      - meraki_alert - Fix situation where specifying emails may crash.
-      - meraki_mx_site_to_site_vpn - Check mode should no longer apply changes when
-        enabled.
+        - Resolved issue
+        - Update pipeline to use newer version of action to detect changed files.
+        - meraki_alert - Fix situation where specifying emails may crash.
+        - meraki_mx_site_to_site_vpn - Check mode should no longer apply changes when
+          enabled.
       known_issues:
-      - meraki_network - Updated documentation for `local_status_page_enabled` and
-        `remote_status_page_enabled` as these no longer work.
+        - meraki_network - Updated documentation for `local_status_page_enabled` and
+          `remote_status_page_enabled` as these no longer work.
       minor_changes:
-      - New module - meraki_network_settings - Configure detailed settings of a network.
+        - New module - meraki_network_settings - Configure detailed settings of a network.
     fragments:
-    - 412-meraki_network-settings.yaml
-    - 412-network-settings.yaml
-    - 414-alert-emails.yaml
-    - issue-meraki_mx_content_filtering.yml
-    - mx-s2s.yaml
-    - pipeline-changelog.yaml
-    - warnings-meraki_ms_ospf.yml
-    - warnings-meraki_ms_stack.yml
-    - warnings-meraki_ms_switchport.yml
-    - warnings-meraki_mx_content_filtering.yml
-    - warnings-meraki_mx_intrusion_prevention.yml
-    - warnings-meraki_mx_l2_interface.yml
-    - warnings-meraki_ssid.yml
-    - workflow-ansible-lint.yml
-    release_date: '2023-01-24'
+      - 412-meraki_network-settings.yaml
+      - 412-network-settings.yaml
+      - 414-alert-emails.yaml
+      - issue-meraki_mx_content_filtering.yml
+      - mx-s2s.yaml
+      - pipeline-changelog.yaml
+      - warnings-meraki_ms_ospf.yml
+      - warnings-meraki_ms_stack.yml
+      - warnings-meraki_ms_switchport.yml
+      - warnings-meraki_mx_content_filtering.yml
+      - warnings-meraki_mx_intrusion_prevention.yml
+      - warnings-meraki_mx_l2_interface.yml
+      - warnings-meraki_ssid.yml
+      - workflow-ansible-lint.yml
+    release_date: "2023-01-24"
   2.15.1:
     changes:
       bugfixes:
-      - Corrects constraints applied to local and remote status page settings to align
-        with API behaviour (https://github.com/CiscoDevNet/ansible-meraki/issues/437)
-      - Enables meraki_network query by net_id (https://github.com/CiscoDevNet/ansible-meraki/issues/441)
-      - Resolved an issue where an empty response from the API triggered an exception
-        in module meraki_webhook (https://github.com/CiscoDevNet/ansible-meraki/issues/433)
-      - Resolves issues with meraki_webhook shared_secret defaulting to null; (https://github.com/CiscoDevNet/ansible-meraki/issues/439);
-        Also adds Test Coverage for shared secret idempotency and resolves test file
-        lint issues.
+        - Corrects constraints applied to local and remote status page settings to align
+          with API behaviour (https://github.com/CiscoDevNet/ansible-meraki/issues/437)
+        - Enables meraki_network query by net_id (https://github.com/CiscoDevNet/ansible-meraki/issues/441)
+        - Resolved an issue where an empty response from the API triggered an exception
+          in module meraki_webhook (https://github.com/CiscoDevNet/ansible-meraki/issues/433)
+        - Resolves issues with meraki_webhook shared_secret defaulting to null; (https://github.com/CiscoDevNet/ansible-meraki/issues/439);
+          Also adds Test Coverage for shared secret idempotency and resolves test file
+          lint issues.
     fragments:
-    - 433_Resolve_meraki_webhook_fail_when_none_defined.yml
-    - Resolve_local_and_remote_status_pages_constraint.yml
-    - Resolve_meraki_network_query_by_ID_returns_empty_data_object.yml
-    - Resolve_shared_secret_defaulting_to_null.yml
-    - warnings-meraki_ms_link_aggregation.yml
-    release_date: '2023-02-15'
+      - 433_Resolve_meraki_webhook_fail_when_none_defined.yml
+      - Resolve_local_and_remote_status_pages_constraint.yml
+      - Resolve_meraki_network_query_by_ID_returns_empty_data_object.yml
+      - Resolve_shared_secret_defaulting_to_null.yml
+      - warnings-meraki_ms_link_aggregation.yml
+    release_date: "2023-02-15"
   2.15.2:
     changes:
       bugfixes:
-      - Resolved the issue with link negotation at meraki_ms_switchport
+        - Resolved the issue with link negotation at meraki_ms_switchport
       minor_changes:
-      - meraki_mx_site_to_site_firewall - Fix updating VPN rules per issue 302.
+        - meraki_mx_site_to_site_firewall - Fix updating VPN rules per issue 302.
     fragments:
-    - 302-firewallorder.yaml
-    - 445-unused-imports.yml
-    - ignore-216.yml
-    - issue-451.yml
-    - warnings-meraki_mx_l3_firewall.yml
-    release_date: '2023-07-01'
+      - 302-firewallorder.yaml
+      - 445-unused-imports.yml
+      - ignore-216.yml
+      - issue-451.yml
+      - warnings-meraki_mx_l3_firewall.yml
+    release_date: "2023-07-01"
   2.15.3:
     changes:
       bugfixes:
-      - meraki_devices - Fix endpoints due to breaking change in Meraki API v1.33
+        - meraki_devices - Fix endpoints due to breaking change in Meraki API v1.33
     fragments:
-    - cicd-3.10.yaml
-    - device-urls.yaml
-    - mxs2sfw-sanity.yaml
-    - organization-sanity.yaml
-    - snmp-sanity.yaml
-    - syslog-sanity.yaml
-    - webhook-sanity.yaml
-    release_date: '2023-07-16'
+      - cicd-3.10.yaml
+      - device-urls.yaml
+      - mxs2sfw-sanity.yaml
+      - organization-sanity.yaml
+      - snmp-sanity.yaml
+      - syslog-sanity.yaml
+      - webhook-sanity.yaml
+    release_date: "2023-07-16"
   2.2.0:
     changes:
       bugfixes:
-      - meraki_network - Fix bug where local or remote settings always show changed.
+        - meraki_network - Fix bug where local or remote settings always show changed.
       minor_changes:
-      - meraki_network - Update documentation to show querying of local or remote
-        settings.
-      - meraki_ssid - Add Cisco ISE as a splash page option.
+        - meraki_network - Update documentation to show querying of local or remote
+          settings.
+        - meraki_ssid - Add Cisco ISE as a splash page option.
     fragments:
-    - network_settings_changed.yml
-    - ssid_ise.yml
-    release_date: '2021-02-01'
+      - network_settings_changed.yml
+      - ssid_ise.yml
+    release_date: "2021-02-01"
   2.2.1:
     changes:
       bugfixes:
-      - meraki_mx_content_filtering - Fix crash with idempotent condition due to improper
-        sorting
+        - meraki_mx_content_filtering - Fix crash with idempotent condition due to improper
+          sorting
     fragments:
-    - 222.yml
-    release_date: '2021-02-22'
+      - 222.yml
+    release_date: "2021-02-22"
   2.3.0:
     changes:
       bugfixes:
-      - meraki_ms_switchport - access_policy_types choices are incorrect causing failures.
-        (https://github.com/CiscoDevNet/ansible-meraki/issues/227).
+        - meraki_ms_switchport - access_policy_types choices are incorrect causing failures.
+          (https://github.com/CiscoDevNet/ansible-meraki/issues/227).
       minor_changes:
-      - meraki_ms_switchport - Adding additional functionality to support the access_policy_types
-        "MAC allow list" and "Sticky MAC allow list" port security configuration options.
-        (https://github.com/CiscoDevNet/ansible-meraki/issues/227).
-      - meraki_mx_intrusion_prevention - Rename message to rule_message to avoid conflicts
-        with internal Ansible variables.
+        - meraki_ms_switchport - Adding additional functionality to support the access_policy_types
+          "MAC allow list" and "Sticky MAC allow list" port security configuration options.
+          (https://github.com/CiscoDevNet/ansible-meraki/issues/227).
+        - meraki_mx_intrusion_prevention - Rename message to rule_message to avoid conflicts
+          with internal Ansible variables.
     fragments:
-    - 228-switchport-module-additions.yml
-    - msg.yaml
-    release_date: '2021-05-12'
+      - 228-switchport-module-additions.yml
+      - msg.yaml
+    release_date: "2021-05-12"
   2.3.1:
     changes:
       bugfixes:
-      - meraki_ms_switchport - link_negotiation choice for 100 Megabit Auto is incorrect
-        causing failures. (https://github.com/CiscoDevNet/ansible-meraki/issues/235).
+        - meraki_ms_switchport - link_negotiation choice for 100 Megabit Auto is incorrect
+          causing failures. (https://github.com/CiscoDevNet/ansible-meraki/issues/235).
     fragments:
-    - CHANGELOG.yml
-    release_date: '2021-05-19'
+      - CHANGELOG.yml
+    release_date: "2021-05-19"
   2.4.0:
     changes:
       bugfixes:
-      - Allow a state of absent in voice vlan to allow the value to be nulled out(https://github.com/CiscoDevNet/ansible-meraki/issues/238)
+        - Allow a state of absent in voice vlan to allow the value to be nulled out(https://github.com/CiscoDevNet/ansible-meraki/issues/238)
       minor_changes:
-      - meraki_mx_switchport - Improve documentation for response
+        - meraki_mx_switchport - Improve documentation for response
     fragments:
-    - 0238-vvlan-allow-null.yml
-    - switchport-docs.yaml
-    release_date: '2021-06-07'
+      - 0238-vvlan-allow-null.yml
+      - switchport-docs.yaml
+    release_date: "2021-06-07"
   2.4.2:
     changes:
       bugfixes:
-      - Fix some flake8 sanity errors as reported by Ansible Galaxy. Should be no
-        functional change.
+        - Fix some flake8 sanity errors as reported by Ansible Galaxy. Should be no
+          functional change.
     fragments:
-    - sanity-fixes.yml
-    release_date: '2021-06-22'
+      - sanity-fixes.yml
+    release_date: "2021-06-22"
   2.5.0:
     changes:
       minor_changes:
-      - meraki_mr_l3_firewall - Return each MR L3 firewall rule's values in lowercase.
-      - meraki_mr_ssid - Add support for radius_proxy_enabled SSID setting.
-      - meraki_mx_l3_firewall - Return each MX L3 firewall rule's values in lowercase.
-      - meraki_mx_vlan - Fix dhcp_boot_options_enabled parameter
+        - meraki_mr_l3_firewall - Return each MR L3 firewall rule's values in lowercase.
+        - meraki_mr_ssid - Add support for radius_proxy_enabled SSID setting.
+        - meraki_mx_l3_firewall - Return each MX L3 firewall rule's values in lowercase.
+        - meraki_mx_vlan - Fix dhcp_boot_options_enabled parameter
     fragments:
-    - dhcp_boot_options_enabled.yaml
-    - lowercase-firewall-rule-values.yml
-    - radius_proxy_enabled.yaml
-    release_date: '2021-10-14'
+      - dhcp_boot_options_enabled.yaml
+      - lowercase-firewall-rule-values.yml
+      - radius_proxy_enabled.yaml
+    release_date: "2021-10-14"
   2.6.0:
     changes:
       bugfixes:
-      - meraki_mr_ssid - Fix issue with SSID removal idempotency when ID doesn't exist
+        - meraki_mr_ssid - Fix issue with SSID removal idempotency when ID doesn't exist
       major_changes:
-      - meraki_mr_radio - New module
+        - meraki_mr_radio - New module
       minor_changes:
-      - meraki_mx_l7_firewall - Allow passing an empty ruleset to delete all rules
-      - meraki_utils - Add debugging output for failed socket connections
+        - meraki_mx_l7_firewall - Allow passing an empty ruleset to delete all rules
+        - meraki_utils - Add debugging output for failed socket connections
     fragments:
-    - delete-ssid-idempotency.yml
-    - docs-m-reference.yml
-    - meraki_mr_radio.yml
-    - mx_l7_firewall_empty_list.yaml
-    release_date: '2021-12-27'
+      - delete-ssid-idempotency.yml
+      - docs-m-reference.yml
+      - meraki_mr_radio.yml
+      - mx_l7_firewall_empty_list.yaml
+    release_date: "2021-12-27"
   2.6.1:
     changes:
       bugfixes:
-      - meraki_mr_rf_profile - Fix issue with idempotency and creation of RF Profiles
-        by name only
-      - meraki_syslog - Improve reliability for multiple roles or capitalization.
+        - meraki_mr_rf_profile - Fix issue with idempotency and creation of RF Profiles
+          by name only
+        - meraki_syslog - Improve reliability for multiple roles or capitalization.
       minor_changes:
-      - meraki_ssid - Add support for enterprise_admin_access and splash_guest_sponsor_domains
-        with the latter required for creating a sponsor portal.
+        - meraki_ssid - Add support for enterprise_admin_access and splash_guest_sponsor_domains
+          with the latter required for creating a sponsor portal.
     fragments:
-    - 288-syslog_idempotency.yml
-    - 290-sponsor.yml
-    - docs-contributing.yml
-    - rf-profile-create-idempotency.yml
-    - sanity_fixes.yaml
-    release_date: '2022-03-28'
+      - 288-syslog_idempotency.yml
+      - 290-sponsor.yml
+      - docs-contributing.yml
+      - rf-profile-create-idempotency.yml
+      - sanity_fixes.yaml
+    release_date: "2022-03-28"
   2.6.2:
     changes:
       bugfixes:
-      - meraki_alert - Updates now properly set default destination webhook
-      - meraki_syslog -  Fix crash due to incorrect dictionary reference
+        - meraki_alert - Updates now properly set default destination webhook
+        - meraki_syslog -  Fix crash due to incorrect dictionary reference
       minor_changes:
-      - Add execution-environment.yml in meta as the base to a Meraki ee
-      - meraki_network - Add Products to net_type list
+        - Add execution-environment.yml in meta as the base to a Meraki ee
+        - meraki_network - Add Products to net_type list
     fragments:
-    - 288-fix-dict.yml
-    - 310-alert-webhook.yml
-    - ee.yml
-    - net_type-list.yml
-    release_date: '2022-05-16'
+      - 288-fix-dict.yml
+      - 310-alert-webhook.yml
+      - ee.yml
+      - net_type-list.yml
+    release_date: "2022-05-16"
   2.7.0:
     changes:
       bugfixes:
-      - meraki_mx_static_route - Add support for gateway_vlan_id otherwise requests
-        could error
+        - meraki_mx_static_route - Add support for gateway_vlan_id otherwise requests
+          could error
       minor_changes:
-      - meraki_mx_network_vlan_settings - New module to enable or disable VLANs on
-        a network
-      - meraki_mx_third_party_vpn_peers - New module for managing third party VPM
-        peers
+        - meraki_mx_network_vlan_settings - New module to enable or disable VLANs on
+          a network
+        - meraki_mx_third_party_vpn_peers - New module for managing third party VPM
+          peers
     fragments:
-    - meraki_mx_network_vlan_settings.yml
-    - mx_static_route.yaml
-    - s2s_peers.yaml
-    release_date: '2022-06-14'
+      - meraki_mx_network_vlan_settings.yml
+      - mx_static_route.yaml
+      - s2s_peers.yaml
+    release_date: "2022-06-14"
   2.8.0:
     changes:
       minor_changes:
-      - meraki_action_batch - New module for CRUD operations on Meraki Action Batches
-      - meraki_switchport - Add support for flexible stacking
+        - meraki_action_batch - New module for CRUD operations on Meraki Action Batches
+        - meraki_switchport - Add support for flexible stacking
     fragments:
-    - 327-switchport-flex.yaml
-    - action_batch.yaml
-    release_date: '2022-06-24'
+      - 327-switchport-flex.yaml
+      - action_batch.yaml
+    release_date: "2022-06-24"
   2.9.0:
     changes:
       bugfixes:
-      - meraki_switchport - Setting VLAN to 0 on trunk port clears the VLAN.
+        - meraki_switchport - Setting VLAN to 0 on trunk port clears the VLAN.
     fragments:
-    - 331-switchport_clear_vlan.yml
-    release_date: '2022-07-04'
+      - 331-switchport_clear_vlan.yml
+    release_date: "2022-07-04"
   2.16.0:
     changes:
       minor_changes:
-      - administered_identities_me_info - new plugin.
-      - devices_appliance_performance_info - new plugin.
-      - devices_appliance_uplinks_settings_info - new plugin.
-      - devices_appliance_uplinks_settings - new plugin.
-      - devices_appliance_vmx_authentication_token - new plugin.
-      - devices_blink_leds - new plugin.
-      - devices_camera_analytics_live_info - new plugin.
-      - devices_camera_custom_analytics_info - new plugin.
-      - devices_camera_custom_analytics - new plugin.
-      - devices_camera_generate_snapshot - new plugin.
-      - devices_camera_quality_and_retention_info - new plugin.
-      - devices_camera_quality_and_retention - new plugin.
-      - devices_camera_sense_info - new plugin.
-      - devices_camera_sense - new plugin.
-      - devices_camera_video_link_info - new plugin.
-      - devices_camera_video_settings_info - new plugin.
-      - devices_camera_video_settings - new plugin.
-      - devices_camera_wireless_profiles_info - new plugin.
-      - devices_camera_wireless_profiles - new plugin.
-      - devices_cellular_gateway_lan_info - new plugin.
-      - devices_cellular_gateway_lan - new plugin.
-      - devices_cellular_gateway_port_forwarding_rules_info - new plugin.
-      - devices_cellular_gateway_port_forwarding_rules - new plugin.
-      - devices_cellular_sims_info - new plugin.
-      - devices_cellular_sims - new plugin.
-      - devices_info - new plugin.
-      - devices_live_tools_ping_device_info - new plugin.
-      - devices_live_tools_ping_device - new plugin.
-      - devices_live_tools_ping_info - new plugin.
-      - devices_live_tools_ping - new plugin.
-      - devices_lldp_cdp_info - new plugin.
-      - devices_management_interface_info - new plugin.
-      - devices_management_interface - new plugin.
-      - devices_sensor_relationships_info - new plugin.
-      - devices_sensor_relationships - new plugin.
-      - devices_switch_ports_cycle - new plugin.
-      - devices_switch_ports_info - new plugin.
-      - devices_switch_ports_statuses_info - new plugin.
-      - devices_switch_ports - new plugin.
-      - devices_switch_routing_interfaces_dhcp_info - new plugin.
-      - devices_switch_routing_interfaces_dhcp - new plugin.
-      - devices_switch_routing_interfaces_info - new plugin.
-      - devices_switch_routing_interfaces - new plugin.
-      - devices_switch_routing_static_routes_info - new plugin.
-      - devices_switch_routing_static_routes - new plugin.
-      - devices_switch_warm_spare_info - new plugin.
-      - devices_switch_warm_spare - new plugin.
-      - devices_wireless_bluetooth_settings_info - new plugin.
-      - devices_wireless_bluetooth_settings - new plugin.
-      - devices_wireless_connection_stats_info - new plugin.
-      - devices_wireless_latency_stats_info - new plugin.
-      - devices_wireless_radio_settings_info - new plugin.
-      - devices_wireless_radio_settings - new plugin.
-      - devices_wireless_status_info - new plugin.
-      - devices - new plugin.
-      - networks_alerts_history_info - new plugin.
-      - networks_alerts_settings_info - new plugin.
-      - networks_alerts_settings - new plugin.
-      - networks_appliance_connectivity_monitoring_destinations_info - new plugin.
-      - networks_appliance_connectivity_monitoring_destinations - new plugin.
-      - networks_appliance_content_filtering_categories_info - new plugin.
-      - networks_appliance_content_filtering_info - new plugin.
-      - networks_appliance_content_filtering - new plugin.
-      - networks_appliance_firewall_cellular_firewall_rules_info - new plugin.
-      - networks_appliance_firewall_cellular_firewall_rules - new plugin.
-      - networks_appliance_firewall_firewalled_services_info - new plugin.
-      - networks_appliance_firewall_firewalled_services - new plugin.
-      - networks_appliance_firewall_inbound_firewall_rules_info - new plugin.
-      - networks_appliance_firewall_inbound_firewall_rules - new plugin.
-      - networks_appliance_firewall_l3_firewall_rules_info - new plugin.
-      - networks_appliance_firewall_l3_firewall_rules - new plugin.
-      - networks_appliance_firewall_l7_firewall_rules_application_categories_info - new plugin.
-      - networks_appliance_firewall_l7_firewall_rules_info - new plugin.
-      - networks_appliance_firewall_l7_firewall_rules - new plugin.
-      - networks_appliance_firewall_one_to_many_nat_rules_info - new plugin.
-      - networks_appliance_firewall_one_to_many_nat_rules - new plugin.
-      - networks_appliance_firewall_one_to_one_nat_rules_info - new plugin.
-      - networks_appliance_firewall_one_to_one_nat_rules - new plugin.
-      - networks_appliance_firewall_port_forwarding_rules_info - new plugin.
-      - networks_appliance_firewall_port_forwarding_rules - new plugin.
-      - networks_appliance_firewall_settings_info - new plugin.
-      - networks_appliance_firewall_settings - new plugin.
-      - networks_appliance_ports_info - new plugin.
-      - networks_appliance_ports - new plugin.
-      - networks_appliance_prefixes_delegated_statics_info - new plugin.
-      - networks_appliance_prefixes_delegated_statics - new plugin.
-      - networks_appliance_security_intrusion_info - new plugin.
-      - networks_appliance_security_intrusion - new plugin.
-      - networks_appliance_security_malware_info - new plugin.
-      - networks_appliance_security_malware - new plugin.
-      - networks_appliance_settings_info - new plugin.
-      - networks_appliance_settings - new plugin.
-      - networks_appliance_single_lan_info - new plugin.
-      - networks_appliance_single_lan - new plugin.
-      - networks_appliance_ssids_info - new plugin.
-      - networks_appliance_ssids - new plugin.
-      - networks_appliance_traffic_shaping_custom_performance_classes - new plugin.
-      - networks_appliance_traffic_shaping_info - new plugin.
-      - networks_appliance_traffic_shaping_rules_info - new plugin.
-      - networks_appliance_traffic_shaping_rules - new plugin.
-      - networks_appliance_traffic_shaping_uplink_bandwidth_info - new plugin.
-      - networks_appliance_traffic_shaping_uplink_bandwidth - new plugin.
-      - networks_appliance_traffic_shaping_uplink_selection_info - new plugin.
-      - networks_appliance_traffic_shaping_uplink_selection - new plugin.
-      - networks_appliance_traffic_shaping - new plugin.
-      - networks_appliance_vlans_info - new plugin.
-      - networks_appliance_vlans_settings_info - new plugin.
-      - networks_appliance_vlans_settings - new plugin.
-      - networks_appliance_vlans - new plugin.
-      - networks_appliance_vpn_bgp_info - new plugin.
-      - networks_appliance_vpn_bgp - new plugin.
-      - networks_appliance_vpn_site_to_site_vpn_info - new plugin.
-      - networks_appliance_vpn_site_to_site_vpn - new plugin.
-      - networks_appliance_warm_spare_info - new plugin.
-      - networks_appliance_warm_spare_swap - new plugin.
-      - networks_appliance_warm_spare - new plugin.
-      - networks_bind - new plugin.
-      - networks_bluetooth_clients_info - new plugin.
-      - networks_camera_quality_retention_profiles_info - new plugin.
-      - networks_camera_quality_retention_profiles - new plugin.
-      - networks_camera_wireless_profiles_info - new plugin.
-      - networks_camera_wireless_profiles - new plugin.
-      - networks_cellular_gateway_connectivity_monitoring_destinations_info - new plugin.
-      - networks_cellular_gateway_connectivity_monitoring_destinations - new plugin.
-      - networks_cellular_gateway_dhcp_info - new plugin.
-      - networks_cellular_gateway_dhcp - new plugin.
-      - networks_cellular_gateway_subnet_pool_info - new plugin.
-      - networks_cellular_gateway_subnet_pool - new plugin.
-      - networks_cellular_gateway_uplink_info - new plugin.
-      - networks_cellular_gateway_uplink - new plugin.
-      - networks_clients_info - new plugin.
-      - networks_clients_overview_info - new plugin.
-      - networks_clients_policy_info - new plugin.
-      - networks_clients_policy - new plugin.
-      - networks_clients_provision - new plugin.
-      - networks_clients_splash_authorization_status_info - new plugin.
-      - networks_clients_splash_authorization_status - new plugin.
-      - networks_devices_claim_vmx - new plugin.
-      - networks_devices_claim - new plugin.
-      - networks_devices_remove - new plugin.
-      - networks_events_event_types_info - new plugin.
-      - networks_events_info - new plugin.
-      - networks_firmware_upgrades_info - new plugin.
-      - networks_firmware_upgrades_rollbacks - new plugin.
-      - networks_firmware_upgrades_staged_events_defer - new plugin.
-      - networks_firmware_upgrades_staged_events_info - new plugin.
-      - networks_firmware_upgrades_staged_events_rollbacks - new plugin.
-      - networks_firmware_upgrades_staged_events - new plugin.
-      - networks_firmware_upgrades_staged_groups_info - new plugin.
-      - networks_firmware_upgrades_staged_groups - new plugin.
-      - networks_firmware_upgrades_staged_stages_info - new plugin.
-      - networks_firmware_upgrades_staged_stages - new plugin.
-      - networks_firmware_upgrades - new plugin.
-      - networks_floor_plans_info - new plugin.
-      - networks_floor_plans - new plugin.
-      - networks_group_policies_info - new plugin.
-      - networks_group_policies - new plugin.
-      - networks_health_alerts_info - new plugin.
-      - networks_info - new plugin.
-      - networks_insight_applications_health_by_time_info - new plugin.
-      - networks_meraki_auth_users_info - new plugin.
-      - networks_meraki_auth_users - new plugin.
-      - networks_mqtt_brokers - new plugin.
-      - networks_netflow_info - new plugin.
-      - networks_netflow - new plugin.
-      - networks_pii_pii_keys_info - new plugin.
-      - networks_pii_requests_delete - new plugin.
-      - networks_pii_requests_info - new plugin.
-      - networks_pii_sm_devices_for_key_info - new plugin.
-      - networks_pii_sm_owners_for_key_info - new plugin.
-      - networks_policies_by_client_info - new plugin.
-      - networks_sensor_alerts_current_overview_by_metric_info - new plugin.
-      - networks_sensor_alerts_overview_by_metric_info - new plugin.
-      - networks_sensor_alerts_profiles_info - new plugin.
-      - networks_sensor_alerts_profiles - new plugin.
-      - networks_sensor_mqtt_brokers_info - new plugin.
-      - networks_sensor_mqtt_brokers - new plugin.
-      - networks_sensor_relationships_info - new plugin.
-      - networks_settings_info - new plugin.
-      - networks_settings - new plugin.
-      - networks_sm_bypass_activation_lock_attempts_info - new plugin.
-      - networks_sm_bypass_activation_lock_attempts - new plugin.
-      - networks_sm_devices_cellular_usage_history_info - new plugin.
-      - networks_sm_devices_certs_info - new plugin.
-      - networks_sm_devices_checkin - new plugin.
-      - networks_sm_devices_connectivity_info - new plugin.
-      - networks_sm_devices_desktop_logs_info - new plugin.
-      - networks_sm_devices_device_command_logs_info - new plugin.
-      - networks_sm_devices_device_profiles_info - new plugin.
-      - networks_sm_devices_fields - new plugin.
-      - networks_sm_devices_info - new plugin.
-      - networks_sm_devices_lock - new plugin.
-      - networks_sm_devices_modify_tags - new plugin.
-      - networks_sm_devices_move - new plugin.
-      - networks_sm_devices_network_adapters_info - new plugin.
-      - networks_sm_devices_performance_history_info - new plugin.
-      - networks_sm_devices_refresh_details - new plugin.
-      - networks_sm_devices_security_centers_info - new plugin.
-      - networks_sm_devices_unenroll - new plugin.
-      - networks_sm_devices_wipe - new plugin.
-      - networks_sm_devices_wlan_lists_info - new plugin.
-      - networks_sm_profiles_info - new plugin.
-      - networks_sm_target_groups_info - new plugin.
-      - networks_sm_target_groups - new plugin.
-      - networks_sm_trusted_access_configs_info - new plugin.
-      - networks_sm_user_access_devices_delete - new plugin.
-      - networks_sm_user_access_devices_info - new plugin.
-      - networks_sm_users_device_profiles_info - new plugin.
-      - networks_sm_users_info - new plugin.
-      - networks_sm_users_softwares_info - new plugin.
-      - networks_snmp_info - new plugin.
-      - networks_snmp - new plugin.
-      - networks_split - new plugin.
-      - networks_switch_access_control_lists_info - new plugin.
-      - networks_switch_access_control_lists - new plugin.
-      - networks_switch_access_policies_info - new plugin.
-      - networks_switch_access_policies - new plugin.
-      - networks_switch_alternate_management_interface_info - new plugin.
-      - networks_switch_alternate_management_interface - new plugin.
-      - networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info - new plugin.
-      - networks_switch_dhcp_server_policy_arp_inspection_trusted_servers - new plugin.
-      - networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info - new plugin.
-      - networks_switch_dhcp_server_policy_info - new plugin.
-      - networks_switch_dhcp_server_policy - new plugin.
-      - networks_switch_dhcp_v4_servers_seen_info - new plugin.
-      - networks_switch_dscp_to_cos_mappings_info - new plugin.
-      - networks_switch_dscp_to_cos_mappings - new plugin.
-      - networks_switch_link_aggregations_info - new plugin.
-      - networks_switch_link_aggregations - new plugin.
-      - networks_switch_mtu_info - new plugin.
-      - networks_switch_mtu - new plugin.
-      - networks_switch_port_schedules_info - new plugin.
-      - networks_switch_port_schedules - new plugin.
-      - networks_switch_qos_rules_order_info - new plugin.
-      - networks_switch_qos_rules_order - new plugin.
-      - networks_switch_routing_multicast_info - new plugin.
-      - networks_switch_routing_multicast_rendezvous_points_info - new plugin.
-      - networks_switch_routing_multicast_rendezvous_points - new plugin.
-      - networks_switch_routing_multicast - new plugin.
-      - networks_switch_routing_ospf_info - new plugin.
-      - networks_switch_routing_ospf - new plugin.
-      - networks_switch_settings_info - new plugin.
-      - networks_switch_settings - new plugin.
-      - networks_switch_stacks_add - new plugin.
-      - networks_switch_stacks_info - new plugin.
-      - networks_switch_stacks_remove - new plugin.
-      - networks_switch_stacks_routing_interfaces_dhcp_info - new plugin.
-      - networks_switch_stacks_routing_interfaces_dhcp - new plugin.
-      - networks_switch_stacks_routing_interfaces_info - new plugin.
-      - networks_switch_stacks_routing_interfaces - new plugin.
-      - networks_switch_stacks_routing_static_routes_info - new plugin.
-      - networks_switch_stacks_routing_static_routes - new plugin.
-      - networks_switch_stacks - new plugin.
-      - networks_switch_storm_control_info - new plugin.
-      - networks_switch_storm_control - new plugin.
-      - networks_switch_stp_info - new plugin.
-      - networks_switch_stp - new plugin.
-      - networks_syslog_servers_info - new plugin.
-      - networks_syslog_servers - new plugin.
-      - networks_topology_link_layer_info - new plugin.
-      - networks_traffic_analysis_info - new plugin.
-      - networks_traffic_analysis - new plugin.
-      - networks_traffic_shaping_application_categories_info - new plugin.
-      - networks_traffic_shaping_dscp_tagging_options_info - new plugin.
-      - networks_unbind - new plugin.
-      - networks_webhooks_http_servers_info - new plugin.
-      - networks_webhooks_http_servers - new plugin.
-      - networks_webhooks_payload_templates_info - new plugin.
-      - networks_webhooks_payload_templates - new plugin.
-      - networks_webhooks_webhook_tests_info - new plugin.
-      - networks_wireless_alternate_management_interface_info - new plugin.
-      - networks_wireless_alternate_management_interface - new plugin.
-      - networks_wireless_billing_info - new plugin.
-      - networks_wireless_billing - new plugin.
-      - networks_wireless_bluetooth_settings_info - new plugin.
-      - networks_wireless_bluetooth_settings - new plugin.
-      - networks_wireless_channel_utilization_history_info - new plugin.
-      - networks_wireless_client_count_history_info - new plugin.
-      - networks_wireless_clients_connection_stats_info - new plugin.
-      - networks_wireless_clients_latency_stats_info - new plugin.
-      - networks_wireless_connection_stats_info - new plugin.
-      - networks_wireless_data_rate_history_info - new plugin.
-      - networks_wireless_devices_connection_stats_info - new plugin.
-      - networks_wireless_failed_connections_info - new plugin.
-      - networks_wireless_latency_history_info - new plugin.
-      - networks_wireless_latency_stats_info - new plugin.
-      - networks_wireless_mesh_statuses_info - new plugin.
-      - networks_wireless_rf_profiles_info - new plugin.
-      - networks_wireless_rf_profiles - new plugin.
-      - networks_wireless_settings_info - new plugin.
-      - networks_wireless_settings - new plugin.
-      - networks_wireless_signal_quality_history_info - new plugin.
-      - networks_wireless_ssids_bonjour_forwarding_info - new plugin.
-      - networks_wireless_ssids_bonjour_forwarding - new plugin.
-      - networks_wireless_ssids_device_type_group_policies_info - new plugin.
-      - networks_wireless_ssids_device_type_group_policies - new plugin.
-      - networks_wireless_ssids_eap_override_info - new plugin.
-      - networks_wireless_ssids_eap_override - new plugin.
-      - networks_wireless_ssids_firewall_l3_firewall_rules_info - new plugin.
-      - networks_wireless_ssids_firewall_l3_firewall_rules - new plugin.
-      - networks_wireless_ssids_firewall_l7_firewall_rules_info - new plugin.
-      - networks_wireless_ssids_firewall_l7_firewall_rules - new plugin.
-      - networks_wireless_ssids_hotspot20_info - new plugin.
-      - networks_wireless_ssids_hotspot20 - new plugin.
-      - networks_wireless_ssids_identity_psks_info - new plugin.
-      - networks_wireless_ssids_identity_psks - new plugin.
-      - networks_wireless_ssids_info - new plugin.
-      - networks_wireless_ssids_schedules_info - new plugin.
-      - networks_wireless_ssids_schedules - new plugin.
-      - networks_wireless_ssids_splash_settings_info - new plugin.
-      - networks_wireless_ssids_splash_settings - new plugin.
-      - networks_wireless_ssids_traffic_shaping_rules_info - new plugin.
-      - networks_wireless_ssids_traffic_shaping_rules - new plugin.
-      - networks_wireless_ssids_vpn_info - new plugin.
-      - networks_wireless_ssids_vpn - new plugin.
-      - networks_wireless_ssids - new plugin.
-      - networks_wireless_usage_history_info - new plugin.
-      - networks - new plugin.
-      - networks_appliance_static_routes_info  - new plugin.
-      - networks_appliance_static_routes  - new plugin.
-      - organizations_action_batches_info - new plugin.
-      - organizations_action_batches - new plugin.
-      - organizations_adaptive_policy_acls_info - new plugin.
-      - organizations_adaptive_policy_acls - new plugin.
-      - organizations_adaptive_policy_groups_info - new plugin.
-      - organizations_adaptive_policy_groups - new plugin.
-      - organizations_adaptive_policy_overview_info - new plugin.
-      - organizations_adaptive_policy_policies_info - new plugin.
-      - organizations_adaptive_policy_policies - new plugin.
-      - organizations_adaptive_policy_settings_info - new plugin.
-      - organizations_adaptive_policy_settings - new plugin.
-      - organizations_admins_info - new plugin.
-      - organizations_admins - new plugin.
-      - organizations_alerts_profiles - new plugin.
-      - organizations_api_requests_info - new plugin.
-      - organizations_api_requests_overview_info - new plugin.
-      - organizations_api_requests_overview_response_codes_by_interval_info - new plugin.
-      - organizations_appliance_security_intrusion_info - new plugin.
-      - organizations_appliance_security_intrusion - new plugin.
-      - organizations_appliance_vpn_third_party_vpnpeers_info - new plugin.
-      - organizations_appliance_vpn_third_party_vpnpeers - new plugin.
-      - organizations_appliance_vpn_vpn_firewall_rules_info - new plugin.
-      - organizations_appliance_vpn_vpn_firewall_rules - new plugin.
-      - organizations_branding_policies_info - new plugin.
-      - organizations_branding_policies_priorities_info - new plugin.
-      - organizations_branding_policies_priorities - new plugin.
-      - organizations_branding_policies - new plugin.
-      - organizations_camera_custom_analytics_artifacts_info - new plugin.
-      - organizations_camera_custom_analytics_artifacts - new plugin.
-      - organizations_cellular_gateway_uplink_statuses_info - new plugin.
-      - organizations_claim - new plugin.
-      - organizations_clients_bandwidth_usage_history_info - new plugin.
-      - organizations_clients_overview_info - new plugin.
-      - organizations_clients_search_info - new plugin.
-      - organizations_clone - new plugin.
-      - organizations_config_templates_info - new plugin.
-      - organizations_config_templates_switch_profiles_info - new plugin.
-      - organizations_config_templates_switch_profiles_ports_info - new plugin.
-      - organizations_config_templates_switch_profiles_ports - new plugin.
-      - organizations_config_templates - new plugin.
-      - organizations_devices_availabilities_info - new plugin.
-      - organizations_devices_info - new plugin.
-      - organizations_devices_power_modules_statuses_by_device_info - new plugin.
-      - organizations_devices_provisioning_statuses_info - new plugin.
-      - organizations_devices_statuses_info - new plugin.
-      - organizations_devices_statuses_overview_info - new plugin.
-      - organizations_devices_uplinks_addresses_by_device_info - new plugin.
-      - organizations_devices_uplinks_loss_and_latency_info - new plugin.
-      - organizations_early_access_features_info - new plugin.
-      - organizations_early_access_features_opt_ins_info - new plugin.
-      - organizations_early_access_features_opt_ins - new plugin.
-      - organizations_firmware_upgrades_by_device_info - new plugin.
-      - organizations_firmware_upgrades_info - new plugin.
-      - organizations_info - new plugin.
-      - organizations_insight_applications_info - new plugin.
-      - organizations_insight_monitored_media_servers_info - new plugin.
-      - organizations_insight_monitored_media_servers - new plugin.
-      - organizations_inventory_claim - new plugin.
-      - organizations_inventory_devices_info - new plugin.
-      - organizations_inventory_onboarding_cloud_monitoring_export_events - new plugin.
-      - organizations_inventory_onboarding_cloud_monitoring_imports_info - new plugin.
-      - organizations_inventory_onboarding_cloud_monitoring_imports - new plugin.
-      - organizations_inventory_onboarding_cloud_monitoring_networks_info - new plugin.
-      - organizations_inventory_onboarding_cloud_monitoring_prepare - new plugin.
-      - organizations_inventory_release - new plugin.
-      - organizations_licenses_assign_seats - new plugin.
-      - organizations_licenses_info - new plugin.
-      - organizations_licenses_move_seats - new plugin.
-      - organizations_licenses_move - new plugin.
-      - organizations_licenses_overview_info - new plugin.
-      - organizations_licenses_renew_seats - new plugin.
-      - organizations_licenses - new plugin.
-      - organizations_licensing_coterm_licenses_info - new plugin.
-      - organizations_licensing_coterm_licenses_move - new plugin.
-      - organizations_login_security_info - new plugin.
-      - organizations_login_security - new plugin.
-      - organizations_networks_combine - new plugin.
-      - organizations_openapi_spec_info - new plugin.
-      - organizations_policy_objects_groups_info - new plugin.
-      - organizations_policy_objects_groups - new plugin.
-      - organizations_policy_objects_info - new plugin.
-      - organizations_policy_objects - new plugin.
-      - organizations_saml_idps_info - new plugin.
-      - organizations_saml_idps - new plugin.
-      - organizations_saml_info - new plugin.
-      - organizations_saml_roles_info - new plugin.
-      - organizations_saml_roles - new plugin.
-      - organizations_saml - new plugin.
-      - organizations_sensor_readings_history_info - new plugin.
-      - organizations_sensor_readings_latest_info - new plugin.
-      - organizations_sm_apns_cert_info - new plugin.
-      - organizations_sm_vpp_accounts_info - new plugin.
-      - organizations_snmp_info - new plugin.
-      - organizations_snmp - new plugin.
-      - organizations_summary_top_appliances_by_utilization_info - new plugin.
-      - organizations_summary_top_clients_by_usage_info - new plugin.
-      - organizations_summary_top_clients_manufacturers_by_usage_info - new plugin.
-      - organizations_summary_top_devices_by_usage_info - new plugin.
-      - organizations_summary_top_devices_models_by_usage_info - new plugin.
-      - organizations_summary_top_ssids_by_usage_info - new plugin.
-      - organizations_summary_top_switches_by_energy_usage_info - new plugin.
-      - organizations_switch_devices_clone - new plugin.
-      - organizations_switch_ports_by_switch_info - new plugin.
-      - organizations_uplinks_statuses_info - new plugin.
-      - organizations_users - new plugin.
-      - organizations_webhooks_logs_info - new plugin.
-      - organizations_wireless_devices_ethernet_statuses_info - new plugin.
-      - organizations - new plugin.
-    release_date: '2023-09-05'
+        - administered_identities_me_info - new plugin.
+        - devices_appliance_performance_info - new plugin.
+        - devices_appliance_uplinks_settings_info - new plugin.
+        - devices_appliance_uplinks_settings - new plugin.
+        - devices_appliance_vmx_authentication_token - new plugin.
+        - devices_blink_leds - new plugin.
+        - devices_camera_analytics_live_info - new plugin.
+        - devices_camera_custom_analytics_info - new plugin.
+        - devices_camera_custom_analytics - new plugin.
+        - devices_camera_generate_snapshot - new plugin.
+        - devices_camera_quality_and_retention_info - new plugin.
+        - devices_camera_quality_and_retention - new plugin.
+        - devices_camera_sense_info - new plugin.
+        - devices_camera_sense - new plugin.
+        - devices_camera_video_link_info - new plugin.
+        - devices_camera_video_settings_info - new plugin.
+        - devices_camera_video_settings - new plugin.
+        - devices_camera_wireless_profiles_info - new plugin.
+        - devices_camera_wireless_profiles - new plugin.
+        - devices_cellular_gateway_lan_info - new plugin.
+        - devices_cellular_gateway_lan - new plugin.
+        - devices_cellular_gateway_port_forwarding_rules_info - new plugin.
+        - devices_cellular_gateway_port_forwarding_rules - new plugin.
+        - devices_cellular_sims_info - new plugin.
+        - devices_cellular_sims - new plugin.
+        - devices_info - new plugin.
+        - devices_live_tools_ping_device_info - new plugin.
+        - devices_live_tools_ping_device - new plugin.
+        - devices_live_tools_ping_info - new plugin.
+        - devices_live_tools_ping - new plugin.
+        - devices_lldp_cdp_info - new plugin.
+        - devices_management_interface_info - new plugin.
+        - devices_management_interface - new plugin.
+        - devices_sensor_relationships_info - new plugin.
+        - devices_sensor_relationships - new plugin.
+        - devices_switch_ports_cycle - new plugin.
+        - devices_switch_ports_info - new plugin.
+        - devices_switch_ports_statuses_info - new plugin.
+        - devices_switch_ports - new plugin.
+        - devices_switch_routing_interfaces_dhcp_info - new plugin.
+        - devices_switch_routing_interfaces_dhcp - new plugin.
+        - devices_switch_routing_interfaces_info - new plugin.
+        - devices_switch_routing_interfaces - new plugin.
+        - devices_switch_routing_static_routes_info - new plugin.
+        - devices_switch_routing_static_routes - new plugin.
+        - devices_switch_warm_spare_info - new plugin.
+        - devices_switch_warm_spare - new plugin.
+        - devices_wireless_bluetooth_settings_info - new plugin.
+        - devices_wireless_bluetooth_settings - new plugin.
+        - devices_wireless_connection_stats_info - new plugin.
+        - devices_wireless_latency_stats_info - new plugin.
+        - devices_wireless_radio_settings_info - new plugin.
+        - devices_wireless_radio_settings - new plugin.
+        - devices_wireless_status_info - new plugin.
+        - devices - new plugin.
+        - networks_alerts_history_info - new plugin.
+        - networks_alerts_settings_info - new plugin.
+        - networks_alerts_settings - new plugin.
+        - networks_appliance_connectivity_monitoring_destinations_info - new plugin.
+        - networks_appliance_connectivity_monitoring_destinations - new plugin.
+        - networks_appliance_content_filtering_categories_info - new plugin.
+        - networks_appliance_content_filtering_info - new plugin.
+        - networks_appliance_content_filtering - new plugin.
+        - networks_appliance_firewall_cellular_firewall_rules_info - new plugin.
+        - networks_appliance_firewall_cellular_firewall_rules - new plugin.
+        - networks_appliance_firewall_firewalled_services_info - new plugin.
+        - networks_appliance_firewall_firewalled_services - new plugin.
+        - networks_appliance_firewall_inbound_firewall_rules_info - new plugin.
+        - networks_appliance_firewall_inbound_firewall_rules - new plugin.
+        - networks_appliance_firewall_l3_firewall_rules_info - new plugin.
+        - networks_appliance_firewall_l3_firewall_rules - new plugin.
+        - networks_appliance_firewall_l7_firewall_rules_application_categories_info - new plugin.
+        - networks_appliance_firewall_l7_firewall_rules_info - new plugin.
+        - networks_appliance_firewall_l7_firewall_rules - new plugin.
+        - networks_appliance_firewall_one_to_many_nat_rules_info - new plugin.
+        - networks_appliance_firewall_one_to_many_nat_rules - new plugin.
+        - networks_appliance_firewall_one_to_one_nat_rules_info - new plugin.
+        - networks_appliance_firewall_one_to_one_nat_rules - new plugin.
+        - networks_appliance_firewall_port_forwarding_rules_info - new plugin.
+        - networks_appliance_firewall_port_forwarding_rules - new plugin.
+        - networks_appliance_firewall_settings_info - new plugin.
+        - networks_appliance_firewall_settings - new plugin.
+        - networks_appliance_ports_info - new plugin.
+        - networks_appliance_ports - new plugin.
+        - networks_appliance_prefixes_delegated_statics_info - new plugin.
+        - networks_appliance_prefixes_delegated_statics - new plugin.
+        - networks_appliance_security_intrusion_info - new plugin.
+        - networks_appliance_security_intrusion - new plugin.
+        - networks_appliance_security_malware_info - new plugin.
+        - networks_appliance_security_malware - new plugin.
+        - networks_appliance_settings_info - new plugin.
+        - networks_appliance_settings - new plugin.
+        - networks_appliance_single_lan_info - new plugin.
+        - networks_appliance_single_lan - new plugin.
+        - networks_appliance_ssids_info - new plugin.
+        - networks_appliance_ssids - new plugin.
+        - networks_appliance_traffic_shaping_custom_performance_classes - new plugin.
+        - networks_appliance_traffic_shaping_info - new plugin.
+        - networks_appliance_traffic_shaping_rules_info - new plugin.
+        - networks_appliance_traffic_shaping_rules - new plugin.
+        - networks_appliance_traffic_shaping_uplink_bandwidth_info - new plugin.
+        - networks_appliance_traffic_shaping_uplink_bandwidth - new plugin.
+        - networks_appliance_traffic_shaping_uplink_selection_info - new plugin.
+        - networks_appliance_traffic_shaping_uplink_selection - new plugin.
+        - networks_appliance_traffic_shaping - new plugin.
+        - networks_appliance_vlans_info - new plugin.
+        - networks_appliance_vlans_settings_info - new plugin.
+        - networks_appliance_vlans_settings - new plugin.
+        - networks_appliance_vlans - new plugin.
+        - networks_appliance_vpn_bgp_info - new plugin.
+        - networks_appliance_vpn_bgp - new plugin.
+        - networks_appliance_vpn_site_to_site_vpn_info - new plugin.
+        - networks_appliance_vpn_site_to_site_vpn - new plugin.
+        - networks_appliance_warm_spare_info - new plugin.
+        - networks_appliance_warm_spare_swap - new plugin.
+        - networks_appliance_warm_spare - new plugin.
+        - networks_bind - new plugin.
+        - networks_bluetooth_clients_info - new plugin.
+        - networks_camera_quality_retention_profiles_info - new plugin.
+        - networks_camera_quality_retention_profiles - new plugin.
+        - networks_camera_wireless_profiles_info - new plugin.
+        - networks_camera_wireless_profiles - new plugin.
+        - networks_cellular_gateway_connectivity_monitoring_destinations_info - new plugin.
+        - networks_cellular_gateway_connectivity_monitoring_destinations - new plugin.
+        - networks_cellular_gateway_dhcp_info - new plugin.
+        - networks_cellular_gateway_dhcp - new plugin.
+        - networks_cellular_gateway_subnet_pool_info - new plugin.
+        - networks_cellular_gateway_subnet_pool - new plugin.
+        - networks_cellular_gateway_uplink_info - new plugin.
+        - networks_cellular_gateway_uplink - new plugin.
+        - networks_clients_info - new plugin.
+        - networks_clients_overview_info - new plugin.
+        - networks_clients_policy_info - new plugin.
+        - networks_clients_policy - new plugin.
+        - networks_clients_provision - new plugin.
+        - networks_clients_splash_authorization_status_info - new plugin.
+        - networks_clients_splash_authorization_status - new plugin.
+        - networks_devices_claim_vmx - new plugin.
+        - networks_devices_claim - new plugin.
+        - networks_devices_remove - new plugin.
+        - networks_events_event_types_info - new plugin.
+        - networks_events_info - new plugin.
+        - networks_firmware_upgrades_info - new plugin.
+        - networks_firmware_upgrades_rollbacks - new plugin.
+        - networks_firmware_upgrades_staged_events_defer - new plugin.
+        - networks_firmware_upgrades_staged_events_info - new plugin.
+        - networks_firmware_upgrades_staged_events_rollbacks - new plugin.
+        - networks_firmware_upgrades_staged_events - new plugin.
+        - networks_firmware_upgrades_staged_groups_info - new plugin.
+        - networks_firmware_upgrades_staged_groups - new plugin.
+        - networks_firmware_upgrades_staged_stages_info - new plugin.
+        - networks_firmware_upgrades_staged_stages - new plugin.
+        - networks_firmware_upgrades - new plugin.
+        - networks_floor_plans_info - new plugin.
+        - networks_floor_plans - new plugin.
+        - networks_group_policies_info - new plugin.
+        - networks_group_policies - new plugin.
+        - networks_health_alerts_info - new plugin.
+        - networks_info - new plugin.
+        - networks_insight_applications_health_by_time_info - new plugin.
+        - networks_meraki_auth_users_info - new plugin.
+        - networks_meraki_auth_users - new plugin.
+        - networks_mqtt_brokers - new plugin.
+        - networks_netflow_info - new plugin.
+        - networks_netflow - new plugin.
+        - networks_pii_pii_keys_info - new plugin.
+        - networks_pii_requests_delete - new plugin.
+        - networks_pii_requests_info - new plugin.
+        - networks_pii_sm_devices_for_key_info - new plugin.
+        - networks_pii_sm_owners_for_key_info - new plugin.
+        - networks_policies_by_client_info - new plugin.
+        - networks_sensor_alerts_current_overview_by_metric_info - new plugin.
+        - networks_sensor_alerts_overview_by_metric_info - new plugin.
+        - networks_sensor_alerts_profiles_info - new plugin.
+        - networks_sensor_alerts_profiles - new plugin.
+        - networks_sensor_mqtt_brokers_info - new plugin.
+        - networks_sensor_mqtt_brokers - new plugin.
+        - networks_sensor_relationships_info - new plugin.
+        - networks_settings_info - new plugin.
+        - networks_settings - new plugin.
+        - networks_sm_bypass_activation_lock_attempts_info - new plugin.
+        - networks_sm_bypass_activation_lock_attempts - new plugin.
+        - networks_sm_devices_cellular_usage_history_info - new plugin.
+        - networks_sm_devices_certs_info - new plugin.
+        - networks_sm_devices_checkin - new plugin.
+        - networks_sm_devices_connectivity_info - new plugin.
+        - networks_sm_devices_desktop_logs_info - new plugin.
+        - networks_sm_devices_device_command_logs_info - new plugin.
+        - networks_sm_devices_device_profiles_info - new plugin.
+        - networks_sm_devices_fields - new plugin.
+        - networks_sm_devices_info - new plugin.
+        - networks_sm_devices_lock - new plugin.
+        - networks_sm_devices_modify_tags - new plugin.
+        - networks_sm_devices_move - new plugin.
+        - networks_sm_devices_network_adapters_info - new plugin.
+        - networks_sm_devices_performance_history_info - new plugin.
+        - networks_sm_devices_refresh_details - new plugin.
+        - networks_sm_devices_security_centers_info - new plugin.
+        - networks_sm_devices_unenroll - new plugin.
+        - networks_sm_devices_wipe - new plugin.
+        - networks_sm_devices_wlan_lists_info - new plugin.
+        - networks_sm_profiles_info - new plugin.
+        - networks_sm_target_groups_info - new plugin.
+        - networks_sm_target_groups - new plugin.
+        - networks_sm_trusted_access_configs_info - new plugin.
+        - networks_sm_user_access_devices_delete - new plugin.
+        - networks_sm_user_access_devices_info - new plugin.
+        - networks_sm_users_device_profiles_info - new plugin.
+        - networks_sm_users_info - new plugin.
+        - networks_sm_users_softwares_info - new plugin.
+        - networks_snmp_info - new plugin.
+        - networks_snmp - new plugin.
+        - networks_split - new plugin.
+        - networks_switch_access_control_lists_info - new plugin.
+        - networks_switch_access_control_lists - new plugin.
+        - networks_switch_access_policies_info - new plugin.
+        - networks_switch_access_policies - new plugin.
+        - networks_switch_alternate_management_interface_info - new plugin.
+        - networks_switch_alternate_management_interface - new plugin.
+        - networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info - new plugin.
+        - networks_switch_dhcp_server_policy_arp_inspection_trusted_servers - new plugin.
+        - networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info - new plugin.
+        - networks_switch_dhcp_server_policy_info - new plugin.
+        - networks_switch_dhcp_server_policy - new plugin.
+        - networks_switch_dhcp_v4_servers_seen_info - new plugin.
+        - networks_switch_dscp_to_cos_mappings_info - new plugin.
+        - networks_switch_dscp_to_cos_mappings - new plugin.
+        - networks_switch_link_aggregations_info - new plugin.
+        - networks_switch_link_aggregations - new plugin.
+        - networks_switch_mtu_info - new plugin.
+        - networks_switch_mtu - new plugin.
+        - networks_switch_port_schedules_info - new plugin.
+        - networks_switch_port_schedules - new plugin.
+        - networks_switch_qos_rules_order_info - new plugin.
+        - networks_switch_qos_rules_order - new plugin.
+        - networks_switch_routing_multicast_info - new plugin.
+        - networks_switch_routing_multicast_rendezvous_points_info - new plugin.
+        - networks_switch_routing_multicast_rendezvous_points - new plugin.
+        - networks_switch_routing_multicast - new plugin.
+        - networks_switch_routing_ospf_info - new plugin.
+        - networks_switch_routing_ospf - new plugin.
+        - networks_switch_settings_info - new plugin.
+        - networks_switch_settings - new plugin.
+        - networks_switch_stacks_add - new plugin.
+        - networks_switch_stacks_info - new plugin.
+        - networks_switch_stacks_remove - new plugin.
+        - networks_switch_stacks_routing_interfaces_dhcp_info - new plugin.
+        - networks_switch_stacks_routing_interfaces_dhcp - new plugin.
+        - networks_switch_stacks_routing_interfaces_info - new plugin.
+        - networks_switch_stacks_routing_interfaces - new plugin.
+        - networks_switch_stacks_routing_static_routes_info - new plugin.
+        - networks_switch_stacks_routing_static_routes - new plugin.
+        - networks_switch_stacks - new plugin.
+        - networks_switch_storm_control_info - new plugin.
+        - networks_switch_storm_control - new plugin.
+        - networks_switch_stp_info - new plugin.
+        - networks_switch_stp - new plugin.
+        - networks_syslog_servers_info - new plugin.
+        - networks_syslog_servers - new plugin.
+        - networks_topology_link_layer_info - new plugin.
+        - networks_traffic_analysis_info - new plugin.
+        - networks_traffic_analysis - new plugin.
+        - networks_traffic_shaping_application_categories_info - new plugin.
+        - networks_traffic_shaping_dscp_tagging_options_info - new plugin.
+        - networks_unbind - new plugin.
+        - networks_webhooks_http_servers_info - new plugin.
+        - networks_webhooks_http_servers - new plugin.
+        - networks_webhooks_payload_templates_info - new plugin.
+        - networks_webhooks_payload_templates - new plugin.
+        - networks_webhooks_webhook_tests_info - new plugin.
+        - networks_wireless_alternate_management_interface_info - new plugin.
+        - networks_wireless_alternate_management_interface - new plugin.
+        - networks_wireless_billing_info - new plugin.
+        - networks_wireless_billing - new plugin.
+        - networks_wireless_bluetooth_settings_info - new plugin.
+        - networks_wireless_bluetooth_settings - new plugin.
+        - networks_wireless_channel_utilization_history_info - new plugin.
+        - networks_wireless_client_count_history_info - new plugin.
+        - networks_wireless_clients_connection_stats_info - new plugin.
+        - networks_wireless_clients_latency_stats_info - new plugin.
+        - networks_wireless_connection_stats_info - new plugin.
+        - networks_wireless_data_rate_history_info - new plugin.
+        - networks_wireless_devices_connection_stats_info - new plugin.
+        - networks_wireless_failed_connections_info - new plugin.
+        - networks_wireless_latency_history_info - new plugin.
+        - networks_wireless_latency_stats_info - new plugin.
+        - networks_wireless_mesh_statuses_info - new plugin.
+        - networks_wireless_rf_profiles_info - new plugin.
+        - networks_wireless_rf_profiles - new plugin.
+        - networks_wireless_settings_info - new plugin.
+        - networks_wireless_settings - new plugin.
+        - networks_wireless_signal_quality_history_info - new plugin.
+        - networks_wireless_ssids_bonjour_forwarding_info - new plugin.
+        - networks_wireless_ssids_bonjour_forwarding - new plugin.
+        - networks_wireless_ssids_device_type_group_policies_info - new plugin.
+        - networks_wireless_ssids_device_type_group_policies - new plugin.
+        - networks_wireless_ssids_eap_override_info - new plugin.
+        - networks_wireless_ssids_eap_override - new plugin.
+        - networks_wireless_ssids_firewall_l3_firewall_rules_info - new plugin.
+        - networks_wireless_ssids_firewall_l3_firewall_rules - new plugin.
+        - networks_wireless_ssids_firewall_l7_firewall_rules_info - new plugin.
+        - networks_wireless_ssids_firewall_l7_firewall_rules - new plugin.
+        - networks_wireless_ssids_hotspot20_info - new plugin.
+        - networks_wireless_ssids_hotspot20 - new plugin.
+        - networks_wireless_ssids_identity_psks_info - new plugin.
+        - networks_wireless_ssids_identity_psks - new plugin.
+        - networks_wireless_ssids_info - new plugin.
+        - networks_wireless_ssids_schedules_info - new plugin.
+        - networks_wireless_ssids_schedules - new plugin.
+        - networks_wireless_ssids_splash_settings_info - new plugin.
+        - networks_wireless_ssids_splash_settings - new plugin.
+        - networks_wireless_ssids_traffic_shaping_rules_info - new plugin.
+        - networks_wireless_ssids_traffic_shaping_rules - new plugin.
+        - networks_wireless_ssids_vpn_info - new plugin.
+        - networks_wireless_ssids_vpn - new plugin.
+        - networks_wireless_ssids - new plugin.
+        - networks_wireless_usage_history_info - new plugin.
+        - networks - new plugin.
+        - networks_appliance_static_routes_info  - new plugin.
+        - networks_appliance_static_routes  - new plugin.
+        - organizations_action_batches_info - new plugin.
+        - organizations_action_batches - new plugin.
+        - organizations_adaptive_policy_acls_info - new plugin.
+        - organizations_adaptive_policy_acls - new plugin.
+        - organizations_adaptive_policy_groups_info - new plugin.
+        - organizations_adaptive_policy_groups - new plugin.
+        - organizations_adaptive_policy_overview_info - new plugin.
+        - organizations_adaptive_policy_policies_info - new plugin.
+        - organizations_adaptive_policy_policies - new plugin.
+        - organizations_adaptive_policy_settings_info - new plugin.
+        - organizations_adaptive_policy_settings - new plugin.
+        - organizations_admins_info - new plugin.
+        - organizations_admins - new plugin.
+        - organizations_alerts_profiles - new plugin.
+        - organizations_api_requests_info - new plugin.
+        - organizations_api_requests_overview_info - new plugin.
+        - organizations_api_requests_overview_response_codes_by_interval_info - new plugin.
+        - organizations_appliance_security_intrusion_info - new plugin.
+        - organizations_appliance_security_intrusion - new plugin.
+        - organizations_appliance_vpn_third_party_vpnpeers_info - new plugin.
+        - organizations_appliance_vpn_third_party_vpnpeers - new plugin.
+        - organizations_appliance_vpn_vpn_firewall_rules_info - new plugin.
+        - organizations_appliance_vpn_vpn_firewall_rules - new plugin.
+        - organizations_branding_policies_info - new plugin.
+        - organizations_branding_policies_priorities_info - new plugin.
+        - organizations_branding_policies_priorities - new plugin.
+        - organizations_branding_policies - new plugin.
+        - organizations_camera_custom_analytics_artifacts_info - new plugin.
+        - organizations_camera_custom_analytics_artifacts - new plugin.
+        - organizations_cellular_gateway_uplink_statuses_info - new plugin.
+        - organizations_claim - new plugin.
+        - organizations_clients_bandwidth_usage_history_info - new plugin.
+        - organizations_clients_overview_info - new plugin.
+        - organizations_clients_search_info - new plugin.
+        - organizations_clone - new plugin.
+        - organizations_config_templates_info - new plugin.
+        - organizations_config_templates_switch_profiles_info - new plugin.
+        - organizations_config_templates_switch_profiles_ports_info - new plugin.
+        - organizations_config_templates_switch_profiles_ports - new plugin.
+        - organizations_config_templates - new plugin.
+        - organizations_devices_availabilities_info - new plugin.
+        - organizations_devices_info - new plugin.
+        - organizations_devices_power_modules_statuses_by_device_info - new plugin.
+        - organizations_devices_provisioning_statuses_info - new plugin.
+        - organizations_devices_statuses_info - new plugin.
+        - organizations_devices_statuses_overview_info - new plugin.
+        - organizations_devices_uplinks_addresses_by_device_info - new plugin.
+        - organizations_devices_uplinks_loss_and_latency_info - new plugin.
+        - organizations_early_access_features_info - new plugin.
+        - organizations_early_access_features_opt_ins_info - new plugin.
+        - organizations_early_access_features_opt_ins - new plugin.
+        - organizations_firmware_upgrades_by_device_info - new plugin.
+        - organizations_firmware_upgrades_info - new plugin.
+        - organizations_info - new plugin.
+        - organizations_insight_applications_info - new plugin.
+        - organizations_insight_monitored_media_servers_info - new plugin.
+        - organizations_insight_monitored_media_servers - new plugin.
+        - organizations_inventory_claim - new plugin.
+        - organizations_inventory_devices_info - new plugin.
+        - organizations_inventory_onboarding_cloud_monitoring_export_events - new plugin.
+        - organizations_inventory_onboarding_cloud_monitoring_imports_info - new plugin.
+        - organizations_inventory_onboarding_cloud_monitoring_imports - new plugin.
+        - organizations_inventory_onboarding_cloud_monitoring_networks_info - new plugin.
+        - organizations_inventory_onboarding_cloud_monitoring_prepare - new plugin.
+        - organizations_inventory_release - new plugin.
+        - organizations_licenses_assign_seats - new plugin.
+        - organizations_licenses_info - new plugin.
+        - organizations_licenses_move_seats - new plugin.
+        - organizations_licenses_move - new plugin.
+        - organizations_licenses_overview_info - new plugin.
+        - organizations_licenses_renew_seats - new plugin.
+        - organizations_licenses - new plugin.
+        - organizations_licensing_coterm_licenses_info - new plugin.
+        - organizations_licensing_coterm_licenses_move - new plugin.
+        - organizations_login_security_info - new plugin.
+        - organizations_login_security - new plugin.
+        - organizations_networks_combine - new plugin.
+        - organizations_openapi_spec_info - new plugin.
+        - organizations_policy_objects_groups_info - new plugin.
+        - organizations_policy_objects_groups - new plugin.
+        - organizations_policy_objects_info - new plugin.
+        - organizations_policy_objects - new plugin.
+        - organizations_saml_idps_info - new plugin.
+        - organizations_saml_idps - new plugin.
+        - organizations_saml_info - new plugin.
+        - organizations_saml_roles_info - new plugin.
+        - organizations_saml_roles - new plugin.
+        - organizations_saml - new plugin.
+        - organizations_sensor_readings_history_info - new plugin.
+        - organizations_sensor_readings_latest_info - new plugin.
+        - organizations_sm_apns_cert_info - new plugin.
+        - organizations_sm_vpp_accounts_info - new plugin.
+        - organizations_snmp_info - new plugin.
+        - organizations_snmp - new plugin.
+        - organizations_summary_top_appliances_by_utilization_info - new plugin.
+        - organizations_summary_top_clients_by_usage_info - new plugin.
+        - organizations_summary_top_clients_manufacturers_by_usage_info - new plugin.
+        - organizations_summary_top_devices_by_usage_info - new plugin.
+        - organizations_summary_top_devices_models_by_usage_info - new plugin.
+        - organizations_summary_top_ssids_by_usage_info - new plugin.
+        - organizations_summary_top_switches_by_energy_usage_info - new plugin.
+        - organizations_switch_devices_clone - new plugin.
+        - organizations_switch_ports_by_switch_info - new plugin.
+        - organizations_uplinks_statuses_info - new plugin.
+        - organizations_users - new plugin.
+        - organizations_webhooks_logs_info - new plugin.
+        - organizations_wireless_devices_ethernet_statuses_info - new plugin.
+        - organizations - new plugin.
+    release_date: "2023-09-05"
 
   2.16.1:
     changes:
       bugfixes:
-      - Updating collection docs link.
-    release_date: '2023-09-21'
+        - Updating collection docs link.
+    release_date: "2023-09-21"
   2.16.2:
     changes:
       bugfixes:
-      - Updating documentation, yml fixes - Documentation Broken.
-    release_date: '2023-09-21'
+        - Updating documentation, yml fixes - Documentation Broken.
+    release_date: "2023-09-21"
   2.16.3:
     changes:
       bugfixes:
-      - Removing ignores.
-    release_date: '2023-09-26'
+        - Removing ignores.
+    release_date: "2023-09-26"
   2.16.4:
     changes:
       bugfixes:
-      - cisco.meraki.networks_devices_claim - got an unexpected keyword argument 'network_id', bug with parameter naming.
-    release_date: '2023-09-28'
+        - cisco.meraki.networks_devices_claim - got an unexpected keyword argument 'network_id', bug with parameter naming.
+    release_date: "2023-09-28"
   2.16.5:
     changes:
       bugfixes:
-      - cisco.meraki.organizations_login_security module will not update org api authentication - fixing for look at organizations_login_security.
-    release_date: '2023-10-10'
+        - cisco.meraki.organizations_login_security module will not update org api authentication - fixing for look at organizations_login_security.
+    release_date: "2023-10-10"
   2.16.6:
     changes:
       bugfixes:
-      - runtime updated requires_ansible from 2.9.10 to '>=2.14.0'.
-    release_date: '2023-10-17'
+        - runtime updated requires_ansible from 2.9.10 to '>=2.14.0'.
+    release_date: "2023-10-17"
   2.16.7:
     changes:
       bugfixes:
-      - Sanity fixes.
-    release_date: '2023-10-17'
+        - Sanity fixes.
+    release_date: "2023-10-17"
   2.16.8:
     changes:
       bugfixes:
-      - Returning requires_ansible to 2.9.10
-    release_date: '2023-10-17'
+        - Returning requires_ansible to 2.9.10
+    release_date: "2023-10-17"
   2.16.10:
     changes:
       bugfixes:
-      - Returning requires_ansible to >=2.14.0
-      - Bad naming `networkId` parameter in `networks_devices_remove` and `networks_devices_claim_vmx`
-    release_date: '2023-10-26'
+        - Returning requires_ansible to >=2.14.0
+        - Bad naming `networkId` parameter in `networks_devices_remove` and `networks_devices_claim_vmx`
+    release_date: "2023-10-26"
   2.16.11:
     changes:
       bugfixes:
-      - Bad naming `networkId` parameter in `networks_appliance_traffic_shaping_custom_performance_classes`.
-      - Bad naming `networkId` parameter in `networks_appliance_warm_spare_swap`.
-      - Bad naming `networkId` parameter in `networks_bind`.
-      - Bad naming `networkId` parameter in `networks_clients_provision`.
-      - Bad naming `networkId` parameter in `networks_firmware_upgrades_rollbacks`.
-      - Bad naming `networkId` parameter in `networks_firmware_upgrades_staged_events_rollbacks`.
-      - Bad naming `networkId` parameter in `networks_mqtt_brokers`.
-      - Bad naming `networkId` parameter in `networks_pii_requests_delete`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_checkin`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_lock`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_modify_tags`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_move`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_refresh_details`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_unenroll`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_wipe`.
-      - Bad naming `networkId` parameter in `networks_sm_user_access_devices_delete`.
-      - Bad naming `networkId` parameter in `networks_split`.
-      - Bad naming `networkId` parameter in `networks_switch_stacks_add`.
-      - Bad naming `networkId` parameter in `networks_switch_stacks_remove`.
-      - Bad naming `networkId` parameter in `networks_unbind`.
-      - Bad naming `networkId` parameter in `networks_sm_devices_fields`.
-    release_date: '2023-10-26'
+        - Bad naming `networkId` parameter in `networks_appliance_traffic_shaping_custom_performance_classes`.
+        - Bad naming `networkId` parameter in `networks_appliance_warm_spare_swap`.
+        - Bad naming `networkId` parameter in `networks_bind`.
+        - Bad naming `networkId` parameter in `networks_clients_provision`.
+        - Bad naming `networkId` parameter in `networks_firmware_upgrades_rollbacks`.
+        - Bad naming `networkId` parameter in `networks_firmware_upgrades_staged_events_rollbacks`.
+        - Bad naming `networkId` parameter in `networks_mqtt_brokers`.
+        - Bad naming `networkId` parameter in `networks_pii_requests_delete`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_checkin`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_lock`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_modify_tags`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_move`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_refresh_details`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_unenroll`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_wipe`.
+        - Bad naming `networkId` parameter in `networks_sm_user_access_devices_delete`.
+        - Bad naming `networkId` parameter in `networks_split`.
+        - Bad naming `networkId` parameter in `networks_switch_stacks_add`.
+        - Bad naming `networkId` parameter in `networks_switch_stacks_remove`.
+        - Bad naming `networkId` parameter in `networks_unbind`.
+        - Bad naming `networkId` parameter in `networks_sm_devices_fields`.
+    release_date: "2023-10-26"
   2.16.12:
     changes:
       bugfixes:
-      - New condition added to Meraki Compare Equality.
-      - Devices module documentation fixed.
-    release_date: '2023-10-26'
+        - New condition added to Meraki Compare Equality.
+        - Devices module documentation fixed.
+    release_date: "2023-10-26"
   2.16.13:
     changes:
       bugfixes:
-      - Meraki Compare Equality 2 added.
-    release_date: '2023-10-30'
+        - Meraki Compare Equality 2 added.
+    release_date: "2023-10-30"
   2.16.14:
     changes:
       bugfixes:
-      - Adding condition to avoid error on exists on devices.
-    release_date: '2023-11-07'
+        - Adding condition to avoid error on exists on devices.
+    release_date: "2023-11-07"
   2.16.15:
     changes:
       bugfixes:
-      - Adding `network_clients_info` and `network_client_info`.
-      - Adding `platform_meraki.rst` to docs.
-    release_date: '2023-11-14'
+        - Adding `network_clients_info` and `network_client_info`.
+        - Adding `platform_meraki.rst` to docs.
+    release_date: "2023-11-14"
   2.16.16:
     changes:
       bugfixes:
@@ -981,29 +981,29 @@ releases:
         - Parameter`organization_id` change to `organizationId` organizations_switch_devices_clone.
         - Parameter`organization_id` change to `organizationId` organizations_users.
         - Removing logs in meraki.py.
-    release_date: '2023-11-30'
+    release_date: "2023-11-30"
 
   2.16.17:
     changes:
       bugfixes:
         - Adding support to ansible.utils >=3.0
-    release_date: '2023-12-04'
+    release_date: "2023-12-04"
 
   2.17.0:
     changes:
       minor_changes:
         - Adding support to ansible.utils ">=2.0.0, <4.00".
-    release_date: '2023-12-05'
+    release_date: "2023-12-05"
   2.17.1:
     changes:
       bugfixes:
         - Adding build_ignore property to galaxy file.
-    release_date: '2023-12-07'
+    release_date: "2023-12-07"
   2.17.2:
     changes:
       bugfixes:
         - Adding `smartquotes = False` to `conf.py` and romoving `'` from rst files.
-    release_date: '2023-12-19'
+    release_date: "2023-12-19"
   2.18.0:
     changes:
       minor_changes:
@@ -1154,5 +1154,17 @@ releases:
   2.20.2:
     changes:
       bugfixes:
-      - runtime updated requires_ansible from 2.14.0 to '>=2.15.0'.
-    release_date: '2025-01-06'
\ No newline at end of file
+        - runtime updated requires_ansible from 2.14.0 to '>=2.15.0'.
+    release_date: "2025-01-06"
+  2.20.3:
+    changes:
+      bugfixes:
+        - README fixes.
+    release_date: "2025-01-07"
+  2.20.4:
+    changes:
+      bugfixes:
+        - Issue fixes for workflow-ansible-lint.
+        - Change alias 'message' to 'message_rule' due is a reserved ansible word in meraki_mx_intrusion_prevention module.
+        - Old playbook tests removed.
+    release_date: "2025-01-08"
diff --git a/changelogs/config.yaml b/changelogs/config.yaml
index 49cf1365d..a035b6645 100644
--- a/changelogs/config.yaml
+++ b/changelogs/config.yaml
@@ -9,21 +9,21 @@ notesdir: fragments
 prelude_section_name: release_summary
 prelude_section_title: Release Summary
 sections:
-- - major_changes
-  - Major Changes
-- - minor_changes
-  - Minor Changes
-- - breaking_changes
-  - Breaking Changes / Porting Guide
-- - deprecated_features
-  - Deprecated Features
-- - removed_features
-  - Removed Features (previously deprecated)
-- - security_fixes
-  - Security Fixes
-- - bugfixes
-  - Bugfixes
-- - known_issues
-  - Known Issues
+  - - major_changes
+    - Major Changes
+  - - minor_changes
+    - Minor Changes
+  - - breaking_changes
+    - Breaking Changes / Porting Guide
+  - - deprecated_features
+    - Deprecated Features
+  - - removed_features
+    - Removed Features (previously deprecated)
+  - - security_fixes
+    - Security Fixes
+  - - bugfixes
+    - Bugfixes
+  - - known_issues
+    - Known Issues
 title: Cisco.Meraki
-trivial_section_name: trivial
\ No newline at end of file
+trivial_section_name: trivial
diff --git a/docs/platform_meraki.rst b/docs/platform_meraki.rst
index 4ec1c37f0..8b15f078d 100644
--- a/docs/platform_meraki.rst
+++ b/docs/platform_meraki.rst
@@ -44,26 +44,26 @@ For modules that do not have the "meraki" prefix, this is an example that you ca
 .. code-block:: yaml
 
   cisco.meraki.administered_identities_me_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: "{{ meraki_api_key }}"
+    meraki_base_url: "{{ meraki_base_url }}"
+    meraki_single_request_timeout: "{{ meraki_single_request_timeout }}"
+    meraki_certificate_path: "{{ meraki_certificate_path }}"
+    meraki_requests_proxy: "{{ meraki_requests_proxy }}"
+    meraki_wait_on_rate_limit: "{{ meraki_wait_on_rate_limit }}"
+    meraki_nginx_429_retry_wait_time: "{{ meraki_nginx_429_retry_wait_time }}"
+    meraki_action_batch_retry_wait_time: "{{ meraki_action_batch_retry_wait_time }}"
+    meraki_retry_4xx_error: "{{ meraki_retry_4xx_error }}"
+    meraki_retry_4xx_error_wait_time: "{{ meraki_retry_4xx_error_wait_time }}"
+    meraki_maximum_retries: "{{ meraki_maximum_retries }}"
+    meraki_output_log: "{{ meraki_output_log }}"
+    meraki_log_file_prefix: "{{ meraki_log_file_prefix }}"
+    meraki_log_path: "{{ meraki_log_path }}"
+    meraki_print_console: "{{ meraki_print_console }}"
+    meraki_suppress_logging: "{{ meraki_suppress_logging }}"
+    meraki_simulate: "{{ meraki_simulate }}"
+    meraki_be_geo_id: "{{ meraki_be_geo_id }}"
+    meraki_use_iterator_for_get_pages: "{{ meraki_use_iterator_for_get_pages }}"
+    meraki_inherit_logging_config: "{{ meraki_inherit_logging_config }}"
   register: result
 
 .. seealso::
diff --git a/galaxy.yml b/galaxy.yml
index f4fb08fb3..548fdce9e 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,10 +1,10 @@
 ---
 namespace: cisco
 name: meraki
-version: 2.20.3
+version: 2.20.4
 readme: README.md
 authors:
-  - Francisco Muñoz <fmunoz@cloverhound.com> 
+  - Francisco Muñoz <fmunoz@cloverhound.com>
   - Bryan Vargas <bvargas@cloverhound.com>
   - William Astorga <wastorga@cloverhound.com>
   - Jose Bogarin <jbogarin@cloverhound.com>
diff --git a/playbooks/Bulk_change_DNS_from_file.yaml b/playbooks/Bulk_change_DNS_from_file.yaml
index 618f5d88d..12122fc49 100644
--- a/playbooks/Bulk_change_DNS_from_file.yaml
+++ b/playbooks/Bulk_change_DNS_from_file.yaml
@@ -1,18 +1,13 @@
----
-# Notes:
-# The playbook can't make changes if the device is using DHCP for IP assignment, it will just run and report success
-# Works by imports the serial numbers of devices to use from a devices.yaml file
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   vars:
-    org_id: "XXXXXXX"
+    org_id: XXXXXXX
   tasks:
     - name: Include vars of devices.yaml into the 'devices' variable
-      include_vars:
+      ansible.builtin.include_vars:
         file: devices.yaml
         name: devices
-
     - name: Change DNS management information
       cisco.meraki.devices_management_interface:
         state: present
diff --git a/playbooks/Create_a_Network.yaml b/playbooks/Create_a_Network.yaml
index 8e78b9215..3f498366d 100644
--- a/playbooks/Create_a_Network.yaml
+++ b/playbooks/Create_a_Network.yaml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create Network
@@ -8,8 +8,8 @@
         organizationId: "828099381482762270"
         name: Made With Ansible networks
         notes: Made_with_anisble
-        productTypes:           
+        productTypes:
           - switch
           - appliance
           - wireless
-        timeZone: Australia/Sydney
\ No newline at end of file
+        timeZone: Australia/Sydney
diff --git a/playbooks/Get_AP_Serials.yaml b/playbooks/Get_AP_Serials.yaml
index 593cdb445..ec935c1d6 100644
--- a/playbooks/Get_AP_Serials.yaml
+++ b/playbooks/Get_AP_Serials.yaml
@@ -1,7 +1,7 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    org_id: "XXXXXXXX"
+    org_id: XXXXXXXX
   gather_facts: false
   tasks:
     - name: Get all organizations _devices
@@ -10,12 +10,12 @@
         organizationId: "{{ org_id }}"
         total_pages: -1
       register: result
-
     - name: Filter APs with "wireless" productTypes and get Serial Number
-      set_fact:
-        filtered_aps: "{{ result.meraki_response | selectattr('productType', 'contains', 'wireless') | map(attribute='serial') | list }}"
+      ansible.builtin.set_fact:
+        filtered_aps:
+          "{{ result.meraki_response | selectattr('productType', 'contains',
+          'wireless') | map(attribute='serial') | list }}"
       register: aps
-
     - name: Show All Devices
       ansible.builtin.debug:
         msg: "{{ aps }}"
diff --git a/playbooks/Get_All_Devices.yaml b/playbooks/Get_All_Devices.yaml
index e9f1ce422..a9e0a4547 100644
--- a/playbooks/Get_All_Devices.yaml
+++ b/playbooks/Get_All_Devices.yaml
@@ -1,7 +1,7 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    org_id: "XXXXXXXX"
+    org_id: XXXXXXXX
   gather_facts: false
   tasks:
     - name: Get all organizations _devices
@@ -10,7 +10,6 @@
         organizationId: "{{ org_id }}"
         total_pages: -1
       register: org_devices
-    
     - name: Show All Devices
       ansible.builtin.debug:
-        msg: "{{ org_devices }}"
\ No newline at end of file
+        msg: "{{ org_devices }}"
diff --git a/playbooks/Get_IP_MGNT_info.yaml b/playbooks/Get_IP_MGNT_info.yaml
index 87e871335..f89f0d56b 100644
--- a/playbooks/Get_IP_MGNT_info.yaml
+++ b/playbooks/Get_IP_MGNT_info.yaml
@@ -1,12 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Query management information
       cisco.meraki.devices_management_interface_info:
         serial: Q3XX-XXXX-XXXX
       register: result
-
     - name: Show Results
       ansible.builtin.debug:
-        msg: "{{ result }}"
\ No newline at end of file
+        msg: "{{ result }}"
diff --git a/playbooks/Get_IP_MGNT_info_from_file.yaml b/playbooks/Get_IP_MGNT_info_from_file.yaml
index 768ae4e24..8b958d487 100644
--- a/playbooks/Get_IP_MGNT_info_from_file.yaml
+++ b/playbooks/Get_IP_MGNT_info_from_file.yaml
@@ -1,19 +1,16 @@
----
-# Works by gettting the serial numbers of devices from the devices.yaml file
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Include vars of devices.yaml into the 'devices' variable
-      include_vars:
+      ansible.builtin.include_vars:
         file: devices.yaml
         name: devices
-
     - name: Query management information
       cisco.meraki.devices_management_interface_info:
         serial: "{{ item.value.serial_no }}"
       register: result
       loop: "{{ lookup('dict', devices) }}"
-
     - name: Show Results
       ansible.builtin.debug:
-        msg: "{{ result }}"
\ No newline at end of file
+        msg: "{{ result }}"
diff --git a/playbooks/Set_IP_MGNT_info.yaml b/playbooks/Set_IP_MGNT_info.yaml
index 52ee9381b..485b9c69a 100644
--- a/playbooks/Set_IP_MGNT_info.yaml
+++ b/playbooks/Set_IP_MGNT_info.yaml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Change management information
@@ -8,9 +8,9 @@
         serial: XXXX-XXXX-XXXX
         wan1:
           staticDns:
-          - 192.168.20.2
-          - 8.8.8.8
+            - 192.168.20.2
+            - 8.8.8.8
           staticGatewayIp: 192.168.20.1
           staticIp: 192.168.20.181
           staticSubnetMask: 255.255.255.0
-          usingStaticIp: true
\ No newline at end of file
+          usingStaticIp: true
diff --git a/playbooks/What_Org.yaml b/playbooks/What_Org.yaml
index d1217d293..93cc0b841 100644
--- a/playbooks/What_Org.yaml
+++ b/playbooks/What_Org.yaml
@@ -1,12 +1,11 @@
----
-- hosts: meraki_servers
+- name: Play Name
+  hosts: meraki_servers
   gather_facts: false
   tasks:
     - name: Get all Organizations
       cisco.meraki.organizations_info:
         meraki_suppress_logging: true
       register: result
-
     - name: Show current Meraki administrator
       ansible.builtin.debug:
-        msg: "{{ result | json_query('meraki_response[*].name') }}"
\ No newline at end of file
+        msg: "{{ result | json_query('meraki_response[*].name') }}"
diff --git a/playbooks/Who_Am_I.yaml b/playbooks/Who_Am_I.yaml
index abbe8a6cd..39376b55a 100644
--- a/playbooks/Who_Am_I.yaml
+++ b/playbooks/Who_Am_I.yaml
@@ -1,21 +1,20 @@
----
-- hosts: meraki_servers
+- name: Play Name
+  hosts: meraki_servers
   gather_facts: false
   tasks:
     - name: Get my administered identities
       cisco.meraki.administered_identities_me_info:
-        meraki_suppress_logging: true  
+        meraki_suppress_logging: true
       register: whoamiresult
-
     - name: Show current Meraki administrator
       ansible.builtin.debug:
-        msg: "{{ whoamiresult.meraki_response.name }} - {{whoamiresult.meraki_response.email}}"
-
+        msg:
+          "{{ whoamiresult.meraki_response.name }} - {{ whoamiresult.meraki_response.email
+          }}"
     - name: Get all Organizations
       cisco.meraki.organizations_info:
-        meraki_suppress_logging: true  
+        meraki_suppress_logging: true
       register: orgresults
-
     - name: Show current Meraki administrator
       ansible.builtin.debug:
-        msg: "{{ orgresults | json_query('meraki_response[*].name') }}"
\ No newline at end of file
+        msg: "{{ orgresults | json_query('meraki_response[*].name') }}"
diff --git a/playbooks/administered_identities_me_api_keys_revoke.yml b/playbooks/administered_identities_me_api_keys_revoke.yml
index ef54d30b8..f7a4565f0 100644
--- a/playbooks/administered_identities_me_api_keys_revoke.yml
+++ b/playbooks/administered_identities_me_api_keys_revoke.yml
@@ -1,32 +1,12 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   vars:
-    org_id: "XXXXXXX"
+    org_id: XXXXXXX
   tasks:
     - name: Include vars of devices.yaml into the 'devices' variable
-      include_vars:
+      ansible.builtin.include_vars:
         file: devices.yaml
         name: devices
     - name: Create
-      cisco.meraki.administered_identities_me_api_keys_revoke:
-        # meraki_api_key: "{{meraki_api_key}}"
-        # meraki_base_url: "{{meraki_base_url}}"
-        # meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-        # meraki_certificate_path: "{{meraki_certificate_path}}"
-        # meraki_requests_proxy: "{{meraki_requests_proxy}}"
-        # meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-        # meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-        # meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-        # meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-        # meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-        # meraki_maximum_retries: "{{meraki_maximum_retries}}"
-        # meraki_output_log: "{{meraki_output_log}}"
-        # meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-        # meraki_log_path: "{{meraki_log_path}}"
-        # meraki_print_console: "{{meraki_print_console}}"
-        # meraki_suppress_logging: "{{meraki_suppress_logging}}"
-        # meraki_simulate: "{{meraki_simulate}}"
-        # meraki_be_geo_id: "{{meraki_be_geo_id}}"
-        # meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-        # meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-        # suffix: string
+      cisco.meraki.administered_identities_me_api_keys_revoke: null
diff --git a/playbooks/administered_identities_me_info.yml b/playbooks/administered_identities_me_info.yml
index fb4314112..61301cc96 100644
--- a/playbooks/administered_identities_me_info.yml
+++ b/playbooks/administered_identities_me_info.yml
@@ -1,28 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all administered _identities _me
       cisco.meraki.administered_identities_me_info:
-        # meraki_api_key: "{{meraki_api_key}}"
-        # meraki_username: "{{meraki_username}}"
-        # meraki_password: "{{meraki_password}}"
-        # meraki_verify: "{{meraki_verify}}"
-        # meraki_port: "{{meraki_port}}"
-        # meraki_version: "{{meraki_version}}"
-        # meraki_debug: "{{meraki_debug}}"
-        # state: present
-        # management:
-        #   details:
-        #   - name: MSP ID
-        #     value: '1234567'
-        # name: Test Ansible
-        # organizationId: "575334852396583071"
-        # api:
-        #   enabled: false
         meraki_suppress_logging: true
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/administrerd_identities_me_api_keys_generate.yml b/playbooks/administrerd_identities_me_api_keys_generate.yml
index 33a10448e..908a51eb9 100644
--- a/playbooks/administrerd_identities_me_api_keys_generate.yml
+++ b/playbooks/administrerd_identities_me_api_keys_generate.yml
@@ -1,13 +1,13 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   vars:
-    org_id: "XXXXXXX"
+    org_id: XXXXXXX
   tasks:
     - name: Include vars of devices.yaml into the 'devices' variable
-      include_vars:
+      ansible.builtin.include_vars:
         file: devices.yaml
         name: devices
-
     - name: Create
       cisco.meraki.administered_identities_me_api_keys_generate:
         meraki_suppress_logging: "false"
diff --git a/playbooks/credentials.template b/playbooks/credentials.template
index d0c43c90a..1c16820d7 100644
--- a/playbooks/credentials.template
+++ b/playbooks/credentials.template
@@ -3,20 +3,20 @@ meraki_api_key: "ABCD"
 meraki_base_url: "https://api.meraki.com/api/v1"
 meraki_single_request_timeout: ""
 meraki_certificate_path: ""
-meraki_requests_proxy: True
+meraki_requests_proxy: true
 meraki_wait_on_rate_limit: 60
 meraki_nginx_429_retry_wait_time: 60
 meraki_action_batch_retry_wait_time: 60
-meraki_retry_4xx_error: False
+meraki_retry_4xx_error: false
 meraki_retry_4xx_error_wait_time: 60
 meraki_maximum_retries: 2
-meraki_output_log: True
+meraki_output_log: true
 meraki_log_file_prefix: "meraki_api_"
 meraki_log_path: ""
-meraki_print_console: True
-meraki_suppress_logging: False
-meraki_simulate: False
+meraki_print_console: true
+meraki_suppress_logging: false
+meraki_simulate: false
 meraki_be_geo_id: ""
 
-meraki_use_iterator_for_get_pages: False
-meraki_inherit_logging_config: False
\ No newline at end of file
+meraki_use_iterator_for_get_pages: false
+meraki_inherit_logging_config: false
\ No newline at end of file
diff --git a/playbooks/credentials.yml b/playbooks/credentials.yml
deleted file mode 100644
index d760e8fb2..000000000
--- a/playbooks/credentials.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-meraki_api_key: "ABCD"
diff --git a/playbooks/device_blink_leds.yml b/playbooks/device_blink_leds.yml
index 1039f3000..deca9c8f3 100644
--- a/playbooks/device_blink_leds.yml
+++ b/playbooks/device_blink_leds.yml
@@ -1,31 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.devices_blink_leds:
-        # meraki_base_url: "{{meraki_base_url}}"
-        # meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-        # meraki_certificate_path: "{{meraki_certificate_path}}"
-        # meraki_requests_proxy: "{{meraki_requests_proxy}}"
-        # meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-        # meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-        # meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-        # meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-        # meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-        # meraki_maximum_retries: "{{meraki_maximum_retries}}"
-        # meraki_output_log: "{{meraki_output_log}}"
-        # meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-        # meraki_log_path: "{{meraki_log_path}}"
-        # meraki_print_console: "{{meraki_print_console}}"
-        # meraki_suppress_logging: "{{meraki_suppress_logging}}"
-        # meraki_simulate: "{{meraki_simulate}}"
-        # meraki_be_geo_id: "{{meraki_be_geo_id}}"
-        # 
-        # meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-        # meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
         meraki_suppress_logging: true
         duration: 20
         duty: 50
         period: 160
-        serial: "QBSB-AX45-LY9A"
+        serial: QBSB-AX45-LY9A
diff --git a/playbooks/device_lldp_cdp.yml b/playbooks/device_lldp_cdp.yml
index 27174fa50..72b55b555 100644
--- a/playbooks/device_lldp_cdp.yml
+++ b/playbooks/device_lldp_cdp.yml
@@ -1,16 +1,13 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
     sn: Q4AC-YTF3-WQ66
   gather_facts: false
   tasks:
-
     - name: Get device's LLDP and CDP neighbors
       cisco.meraki.devices_lldp_cdp_info:
         serial: "{{ sn }}"
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/device_statuses.yml b/playbooks/device_statuses.yml
index 184379110..a1e04d832 100644
--- a/playbooks/device_statuses.yml
+++ b/playbooks/device_statuses.yml
@@ -1,16 +1,13 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
     organization_id: 828099381482762270
   gather_facts: false
   tasks:
-
     - name: Get all organization's devices statuses
       cisco.meraki.organizations_devices_statuses_info:
         organizationId: "{{ organization_id }}"
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/devices.yaml b/playbooks/devices.yaml
deleted file mode 100644
index 6938b5d0d..000000000
--- a/playbooks/devices.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-device-1:
-  serial_no: Q3XX-XXXX-XXXX
-
-device-2:
-  serial_no: Q3XX-XXXX-XXXX
-
-device-3:
-  serial_no: Q3XX-XXXX-XXXX
\ No newline at end of file
diff --git a/playbooks/devices.yml b/playbooks/devices.yml
index 0484243d1..f5f9b70d2 100644
--- a/playbooks/devices.yml
+++ b/playbooks/devices.yml
@@ -1,19 +1,9 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
-    # - name: Update by id
-    #   cisco.meraki.devices:
-    #     meraki_suppress_logging: false
-    #     state: present
-    #     # lat: "37.4180951010364"
-    #     # lng: "-122.098531723021"
-    #     # mac: 4c:c8:a1:11:01:0b
-    #     name: My AP 3
-    #     serial: QBSD-36C3-473D
-    #     # tags: ["testing"]
-    - name: change name of device
+    - name: Change name of device
       cisco.meraki.devices:
         name: new name 12
         serial: QBSC-ALSL-3GXN
-        state: present 
\ No newline at end of file
+        state: present
diff --git a/playbooks/devices_info.yml b/playbooks/devices_info.yml
index 934f31bfe..4fa7515b0 100644
--- a/playbooks/devices_info.yml
+++ b/playbooks/devices_info.yml
@@ -1,18 +1,14 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get Device
       cisco.meraki.devices_info:
         meraki_suppress_logging: true
         organizationId: "828099381482762270"
-        # serial: QBSD-36C3-473D
-        # tags: ["recently-added"]
-        # productTypes: ["appliance"]
         perPage: 3
         total_pages: -1
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/devices_live_tools_ping.yml b/playbooks/devices_live_tools_ping.yml
index 9276a4cd4..f8f579b16 100644
--- a/playbooks/devices_live_tools_ping.yml
+++ b/playbooks/devices_live_tools_ping.yml
@@ -1,30 +1,10 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.devices_live_tools_ping:
         meraki_suppress_logging: true
-        # meraki_base_url: "{{meraki_base_url}}"
-        # meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-        # meraki_certificate_path: "{{meraki_certificate_path}}"
-        # meraki_requests_proxy: "{{meraki_requests_proxy}}"
-        # meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-        # meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-        # meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-        # meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-        # meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-        # meraki_maximum_retries: "{{meraki_maximum_retries}}"
-        # meraki_output_log: "{{meraki_output_log}}"
-        # meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-        # meraki_log_path: "{{meraki_log_path}}"
-        # meraki_print_console: "{{meraki_print_console}}"
-        # meraki_suppress_logging: "{{meraki_suppress_logging}}"
-        # meraki_simulate: "{{meraki_simulate}}"
-        # meraki_be_geo_id: "{{meraki_be_geo_id}}"
-        # 
-        # meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-        # meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
         state: present
         count: 2
         serial: QBSD-36C3-473D
diff --git a/playbooks/devices_switch_routing_interfaces.yml b/playbooks/devices_switch_routing_interfaces.yml
index 2163ea214..2cac1052e 100644
--- a/playbooks/devices_switch_routing_interfaces.yml
+++ b/playbooks/devices_switch_routing_interfaces.yml
@@ -1,27 +1,12 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
-  - name: Create
-    cisco.meraki.devices_switch_routing_interfaces:
-      meraki_suppress_logging: true
-      state: present
-      defaultGateway: 192.168.1.1
-      interfaceIp: 192.168.1.2
-      # ipv6:
-      #   address: 1:2:3:4::1
-      #   assignmentMode: static
-      #   gateway: 1:2:3:4::2
-      #   prefix: 1:2:3:4::/48
-      # multicastRouting: disabled
-      name: L3 interface
-      # ospfSettings:
-      #   area: '0'
-      #   cost: 1
-      #   isPassiveEnabled: true
-      # ospfV3:
-      #   area: '1'
-      #   cost: 2
-      #   isPassiveEnabled: true
-      serial: L_828099381482770866
-      # subnet: 192.168.1.0/24
-      # vlanId: 100
\ No newline at end of file
+    - name: Create
+      cisco.meraki.devices_switch_routing_interfaces:
+        meraki_suppress_logging: true
+        state: present
+        defaultGateway: 192.168.1.1
+        interfaceIp: 192.168.1.2
+        name: L3 interface
+        serial: L_828099381482770866
diff --git a/playbooks/meraki_api__log__2024-11-06_10-46-04.log b/playbooks/meraki_api__log__2024-11-06_10-46-04.log
deleted file mode 100644
index 09e6beed5..000000000
--- a/playbooks/meraki_api__log__2024-11-06_10-46-04.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-11-06 10:46:04       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-11-06 10:46:04       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-11-06 10:46:04       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-11-06 10:46:05       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-11-06 10:46:05       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'createOrganizationNetwork', 'method': 'POST', 'url': '/organizations/828099381482762270/networks', 'json': {'notes': 'Additional description of the network', 'timeZone': 'America/Los_Angeles', 'name': 'New network by Ansible', 'productTypes': ['appliance', 'switch']}}
-2024-11-06 10:46:05       meraki:     INFO > POST https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-11-06 10:46:06       meraki:     INFO > organizations, createOrganizationNetwork - 201 Created
diff --git a/playbooks/meraki_api__log__2024-11-06_10-46-09.log b/playbooks/meraki_api__log__2024-11-06_10-46-09.log
deleted file mode 100644
index 6434de24b..000000000
--- a/playbooks/meraki_api__log__2024-11-06_10-46-09.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-11-06 10:46:09       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-11-06 10:46:09       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-11-06 10:46:09       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-11-06 10:46:10       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-11-06 10:46:10       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-11-06 10:46:10       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-11-06 10:46:10       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-11-06_11-08-45.log b/playbooks/meraki_api__log__2024-11-06_11-08-45.log
deleted file mode 100644
index db7d7c4c9..000000000
--- a/playbooks/meraki_api__log__2024-11-06_11-08-45.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-11-06 11:08:45       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-11-06 11:08:45       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-11-06 11:08:45       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-11-06 11:08:46       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-11-06 11:08:46       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-11-06 11:08:46       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-11-06 11:08:47       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-11-06_11-08-51.log b/playbooks/meraki_api__log__2024-11-06_11-08-51.log
deleted file mode 100644
index d67be81c3..000000000
--- a/playbooks/meraki_api__log__2024-11-06_11-08-51.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-11-06 11:08:51       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-11-06 11:08:51       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-11-06 11:08:51       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-11-06 11:08:51       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-11-06 11:08:51       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-11-06 11:08:51       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-11-06 11:08:51       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_13-30-30.log b/playbooks/meraki_api__log__2024-12-17_13-30-30.log
deleted file mode 100644
index 900d95dc6..000000000
--- a/playbooks/meraki_api__log__2024-12-17_13-30-30.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-12-17 13:30:30       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 13:30:30       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-12-17 13:30:30       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-12-17 13:30:31       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-12-17 13:30:31       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-12-17 13:30:31       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-12-17 13:30:31       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_13-30-33.log b/playbooks/meraki_api__log__2024-12-17_13-30-33.log
deleted file mode 100644
index c7e0bddc7..000000000
--- a/playbooks/meraki_api__log__2024-12-17_13-30-33.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-12-17 13:30:33       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 13:30:33       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-12-17 13:30:33       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-12-17 13:30:34       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-12-17 13:30:34       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-12-17 13:30:34       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-12-17 13:30:35       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_13-36-53.log b/playbooks/meraki_api__log__2024-12-17_13-36-53.log
deleted file mode 100644
index 1ada9a014..000000000
--- a/playbooks/meraki_api__log__2024-12-17_13-36-53.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-12-17 13:36:53       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 13:36:53       meraki:    DEBUG > {'tags': ['appliance', 'configure', 'ssids'], 'operation': 'getNetworkApplianceSsid', 'method': 'GET', 'url': '/networks/L_828099381482771185/appliance/ssids/1234', 'params': None}
-2024-12-17 13:36:53       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482771185/appliance/ssids/1234
-2024-12-17 13:36:54       meraki:    ERROR > appliance, getNetworkApplianceSsid - 404 Not Found, {'errors': ['SSID not found']}
-2024-12-17 13:36:54       meraki:    DEBUG > {'tags': ['appliance', 'configure', 'ssids'], 'operation': 'getNetworkApplianceSsids', 'method': 'GET', 'url': '/networks/L_828099381482771185/appliance/ssids', 'params': None}
-2024-12-17 13:36:54       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482771185/appliance/ssids
-2024-12-17 13:36:55       meraki:     INFO > appliance, getNetworkApplianceSsids - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_14-17-58.log b/playbooks/meraki_api__log__2024-12-17_14-17-58.log
deleted file mode 100644
index e72e6773e..000000000
--- a/playbooks/meraki_api__log__2024-12-17_14-17-58.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-12-17 14:17:58       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 14:17:58       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-12-17 14:17:58       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-12-17 14:17:59       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-12-17 14:17:59       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-12-17 14:17:59       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-12-17 14:17:59       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_14-18-00.log b/playbooks/meraki_api__log__2024-12-17_14-18-00.log
deleted file mode 100644
index f7c12da01..000000000
--- a/playbooks/meraki_api__log__2024-12-17_14-18-00.log
+++ /dev/null
@@ -1,7 +0,0 @@
-2024-12-17 14:18:00       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 14:18:00       meraki:    DEBUG > {'tags': ['organizations', 'configure', 'networks'], 'operation': 'getOrganizationNetworks', 'page': 1}
-2024-12-17 14:18:00       meraki:     INFO > GET https://api.meraki.com/api/v1/organizations/828099381482762270/networks
-2024-12-17 14:18:01       meraki:     INFO > organizations, getOrganizationNetworks; page 1 - 200 OK
-2024-12-17 14:18:01       meraki:    DEBUG > {'tags': ['networks', 'configure'], 'operation': 'getNetwork', 'method': 'GET', 'url': '/networks/L_828099381482776622', 'params': None}
-2024-12-17 14:18:01       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482776622
-2024-12-17 14:18:02       meraki:     INFO > networks, getNetwork - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_14-32-05.log b/playbooks/meraki_api__log__2024-12-17_14-32-05.log
deleted file mode 100644
index 02d3e058b..000000000
--- a/playbooks/meraki_api__log__2024-12-17_14-32-05.log
+++ /dev/null
@@ -1 +0,0 @@
-2024-12-17 14:32:05       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
diff --git a/playbooks/meraki_api__log__2024-12-17_14-36-09.log b/playbooks/meraki_api__log__2024-12-17_14-36-09.log
deleted file mode 100644
index c0df0c50a..000000000
--- a/playbooks/meraki_api__log__2024-12-17_14-36-09.log
+++ /dev/null
@@ -1,4 +0,0 @@
-2024-12-17 14:36:09       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 14:36:09       meraki:    DEBUG > {'tags': ['networks', 'monitor', 'clients'], 'operation': 'getNetworkClients', 'page': 1}
-2024-12-17 14:36:09       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482771185/clients
-2024-12-17 14:36:10       meraki:     INFO > networks, getNetworkClients; page 1 - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-17_14-36-11.log b/playbooks/meraki_api__log__2024-12-17_14-36-11.log
deleted file mode 100644
index d3c214720..000000000
--- a/playbooks/meraki_api__log__2024-12-17_14-36-11.log
+++ /dev/null
@@ -1,4 +0,0 @@
-2024-12-17 14:36:11       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-17 14:36:11       meraki:    DEBUG > {'tags': ['networks', 'monitor', 'clients'], 'operation': 'getNetworkClients', 'page': 1}
-2024-12-17 14:36:11       meraki:     INFO > GET https://api.meraki.com/api/v1/networks/L_828099381482771185/clients
-2024-12-17 14:36:12       meraki:     INFO > networks, getNetworkClients; page 1 - 200 OK
diff --git a/playbooks/meraki_api__log__2024-12-18_13-22-50.log b/playbooks/meraki_api__log__2024-12-18_13-22-50.log
deleted file mode 100644
index f02c6bc27..000000000
--- a/playbooks/meraki_api__log__2024-12-18_13-22-50.log
+++ /dev/null
@@ -1,4 +0,0 @@
-2024-12-18 13:22:50       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.51.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-18 13:22:50       meraki:    DEBUG > {'tags': ['administered', 'configure', 'identities', 'me', 'api', 'keys'], 'operation': 'generateAdministeredIdentitiesMeApiKeys', 'method': 'POST', 'url': '/administered/identities/me/api/keys/generate', 'json': None}
-2024-12-18 13:22:50       meraki:     INFO > POST https://api.meraki.com/api/v1/administered/identities/me/api/keys/generate
-2024-12-18 13:22:51       meraki:     INFO > administered, generateAdministeredIdentitiesMeApiKeys - 202 Accepted
diff --git a/playbooks/meraki_api__log__2024-12-18_13-25-06.log b/playbooks/meraki_api__log__2024-12-18_13-25-06.log
deleted file mode 100644
index 0c6095669..000000000
--- a/playbooks/meraki_api__log__2024-12-18_13-25-06.log
+++ /dev/null
@@ -1,4 +0,0 @@
-2024-12-18 13:25:06       meraki:     INFO > Meraki dashboard API session initialized with these parameters: {'version': '1.53.0', 'api_key': '************************************08cf', 'base_url': 'https://api.meraki.com/api/v1', 'single_request_timeout': 60, 'certificate_path': '', 'requests_proxy': '', 'wait_on_rate_limit': True, 'nginx_429_retry_wait_time': 60, 'action_batch_retry_wait_time': 60, 'network_delete_retry_wait_time': 240, 'retry_4xx_error': False, 'retry_4xx_error_wait_time': 60, 'maximum_retries': 2, 'simulate': False, 'be_geo_id': None, 'caller': 'MerakiAnsibleCollection/1.0.0 Cisco', 'use_iterator_for_get_pages': False}
-2024-12-18 13:25:06       meraki:    DEBUG > {'tags': ['administered', 'configure', 'identities', 'me', 'api', 'keys'], 'operation': 'generateAdministeredIdentitiesMeApiKeys', 'method': 'POST', 'url': '/administered/identities/me/api/keys/generate', 'json': None}
-2024-12-18 13:25:06       meraki:     INFO > POST https://api.meraki.com/api/v1/administered/identities/me/api/keys/generate
-2024-12-18 13:25:07       meraki:    ERROR > administered, generateAdministeredIdentitiesMeApiKeys - 400 Bad Request, {'errors': ['Identity has already reached maximum quota of two API keys']}
diff --git a/playbooks/ms_playbook.yml b/playbooks/ms_playbook.yml
index c9f2d333b..23710ee5c 100644
--- a/playbooks/ms_playbook.yml
+++ b/playbooks/ms_playbook.yml
@@ -1,66 +1,57 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    network_id: L_828099381482770866 # Site-2
+    network_id: L_828099381482770866
     serial_number: QBSB-D5ZD-9CXT
   gather_facts: false
   tasks:
-
-  - name: Update STP settings
-    cisco.meraki.networks_switch_stp:
-      networkId: "{{ network_id }}"
-      rstpEnabled: true
-      stpBridgePriority:
-      - stpPriority: 4096
-        switches:
-        - "{{ serial_number }}"
-
-  - name: Update switch settings
-    cisco.meraki.networks_switch_settings:
-      networkId: "{{ network_id }}"
-      useCombinedPower: true
-      vlan: 1
-
-  - name: Update storm-control settings
-    cisco.meraki.networks_switch_storm_control:
-      networkId: "{{ network_id }}"
-      broadcastThreshold: 30
-      multicastThreshold: 30
-      unknownUnicastThreshold: 30
-
-  - name: Update MTU settings
-    cisco.meraki.networks_switch_mtu:
-      networkId: "{{ network_id }}"
-      defaultMtuSize: 9578
-
-  - name: Createa a routing interface
-    cisco.meraki.devices_switch_routing_interfaces:
-      defaultGateway: 192.168.1.1
-      interfaceIp: 192.168.1.2
-      name: L3 interface
-      serial: "{{ serial_number }}"
-      subnet: 192.168.1.0/24
-      vlanId: 123
-
-  - name: Create a static route
-    cisco.meraki.devices_switch_routing_static_routes:
-      serial: "{{ serial_number }}"
-      name: My route
-      nextHopIp: 192.168.1.100
-      subnet: 1.2.3.0/24
-
-  - name: Create a static route
-    cisco.meraki.devices_switch_routing_static_routes:
-      serial: "{{ serial_number }}"
-      name: My route
-      nextHopIp: 192.168.1.100
-      subnet: 1.2.3.0/24
-
-  - name: Port cycle
-    cisco.meraki.devices_switch_ports_cycle:
-      serial: "{{ serial_number }}"
-      ports:
-      - 1
-      - "4-5"
-      - "25-48"
+    - name: Update STP settings
+      cisco.meraki.networks_switch_stp:
+        networkId: "{{ network_id }}"
+        rstpEnabled: true
+        stpBridgePriority:
+          - stpPriority: 4096
+            switches:
+              - "{{ serial_number }}"
+    - name: Update switch settings
+      cisco.meraki.networks_switch_settings:
+        networkId: "{{ network_id }}"
+        useCombinedPower: true
+        vlan: 1
+    - name: Update storm-control settings
+      cisco.meraki.networks_switch_storm_control:
+        networkId: "{{ network_id }}"
+        broadcastThreshold: 30
+        multicastThreshold: 30
+        unknownUnicastThreshold: 30
+    - name: Update MTU settings
+      cisco.meraki.networks_switch_mtu:
+        networkId: "{{ network_id }}"
+        defaultMtuSize: 9578
+    - name: Createa a routing interface
+      cisco.meraki.devices_switch_routing_interfaces:
+        defaultGateway: 192.168.1.1
+        interfaceIp: 192.168.1.2
+        name: L3 interface
+        serial: "{{ serial_number }}"
+        subnet: 192.168.1.0/24
+        vlanId: 123
+    - name: Create a static route
+      cisco.meraki.devices_switch_routing_static_routes:
+        serial: "{{ serial_number }}"
+        name: My route
+        nextHopIp: 192.168.1.100
+        subnet: 1.2.3.0/24
+    - name: Create a static route
+      cisco.meraki.devices_switch_routing_static_routes:
+        serial: "{{ serial_number }}"
+        name: My route
+        nextHopIp: 192.168.1.100
+        subnet: 1.2.3.0/24
+    - name: Port cycle
+      cisco.meraki.devices_switch_ports_cycle:
+        serial: "{{ serial_number }}"
+        ports:
+          - 1
+          - 4-5
+          - 25-48
diff --git a/playbooks/mv_playbook.yml b/playbooks/mv_playbook.yml
index 78d8c07ba..a5920b0d5 100644
--- a/playbooks/mv_playbook.yml
+++ b/playbooks/mv_playbook.yml
@@ -1,63 +1,50 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
     serial_number: QBSD-8VXX-6QXX
-    network_id: L_828099381482770866 # Site-2
+    network_id: L_828099381482770866
   gather_facts: false
   tasks:
-
-  - name: Update Camera name
-    cisco.meraki.devices:
-      serial: "{{ serial_number }}"
-      name: My Camera
-
-  - name: Update Camera video settings
-    cisco.meraki.devices_camera_video_settings:
-      serial: "{{ serial_number }}"
-      externalRtspEnabled: true
-
-  - name: Create a primary wireless profile
-    cisco.meraki.networks_camera_wireless_profiles:
-      networkId: "{{ network_id }}"
-      name: wireless profile A
-      ssid:
-        name: cameras ssid
-        authMode: psk
-        encryptionMode: wpa
-        psk: SuperSecretPreSharedKey
-    register: primary_profile
-  
-  - name: Create a secondary wireless profile
-    cisco.meraki.networks_camera_wireless_profiles:
-      networkId: "{{ network_id }}"
-      name: wireless profile B
-      ssid:
-        name: cameras ssid 2
-        authMode: psk
-        encryptionMode: wpa
-        psk: SuperSecretPreSharedKey
-    register: secondary_profile
-
-  - name: Associate the camera with the wireless profile
-    cisco.meraki.devices_camera_wireless_profiles:
-      serial: "{{ serial_number }}"
-      ids:
-        primary: "{{ primary_profile['meraki_response']['id'] }}"
-        secondary: "{{ secondary_profile['meraki_response']['id'] }}"
-
-  - name: Update quality and retention settings
-    cisco.meraki.devices_camera_quality_and_retention:
-      serial: "{{ serial_number }}"
-      audioRecordingEnabled: true
-      motionBasedRetentionEnabled: true
-      motionDetectorVersion: 2
-      quality: High
-      resolution: 1920x1080
-      restrictedBandwidthModeEnabled: false
-
-  # - name: Generate a snapshop
-  #   cisco.meraki.devices_camera_generate_snapshot:
-  #     serial: "{{ serial_number }}"
-  #     fullframe: false
-  #     timestamp: '2023-08-08T15:18:08Z'
\ No newline at end of file
+    - name: Update Camera name
+      cisco.meraki.devices:
+        serial: "{{ serial_number }}"
+        name: My Camera
+    - name: Update Camera video settings
+      cisco.meraki.devices_camera_video_settings:
+        serial: "{{ serial_number }}"
+        externalRtspEnabled: true
+    - name: Create a primary wireless profile
+      cisco.meraki.networks_camera_wireless_profiles:
+        networkId: "{{ network_id }}"
+        name: wireless profile A
+        ssid:
+          name: cameras ssid
+          authMode: psk
+          encryptionMode: wpa
+          psk: SuperSecretPreSharedKey
+      register: primary_profile
+    - name: Create a secondary wireless profile
+      cisco.meraki.networks_camera_wireless_profiles:
+        networkId: "{{ network_id }}"
+        name: wireless profile B
+        ssid:
+          name: cameras ssid 2
+          authMode: psk
+          encryptionMode: wpa
+          psk: SuperSecretPreSharedKey
+      register: secondary_profile
+    - name: Associate the camera with the wireless profile
+      cisco.meraki.devices_camera_wireless_profiles:
+        serial: "{{ serial_number }}"
+        ids:
+          primary: "{{ primary_profile['meraki_response']['id'] }}"
+          secondary: "{{ secondary_profile['meraki_response']['id'] }}"
+    - name: Update quality and retention settings
+      cisco.meraki.devices_camera_quality_and_retention:
+        serial: "{{ serial_number }}"
+        audioRecordingEnabled: true
+        motionBasedRetentionEnabled: true
+        motionDetectorVersion: 2
+        quality: High
+        resolution: 1920x1080
+        restrictedBandwidthModeEnabled: false
diff --git a/playbooks/mx_deployment.yml b/playbooks/mx_deployment.yml
index 13942f3c8..20339983e 100644
--- a/playbooks/mx_deployment.yml
+++ b/playbooks/mx_deployment.yml
@@ -1,69 +1,57 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    network_id: "L_828099381482771185" # Branch-1234
+    network_id: L_828099381482771185
   gather_facts: false
   tasks:
     - name: Get all networks _appliance _vlans
       cisco.meraki.networks_appliance_vlans_info:
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
       register: result
-
-    # - name: Enable Vlans on the MX
-    #   cisco.meraki.networks_appliance_vlans_settings:
-    #     state: present
-    #     networkId: "{{network_id}}"
-    #     vlansEnabled: true
-
     - name: Update appliance Vlans
       cisco.meraki.networks_appliance_vlans:
         state: present
         applianceIp: 192.168.1.2
         cidr: 192.168.1.0/24
-        id: '1234'
+        id: "1234"
         name: My VLAN
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         subnet: 192.168.1.0/24
-
     - name: Update appliance SSID
       cisco.meraki.networks_appliance_ssids:
-       meraki_suppress_logging: false
-       state: present
-       authMode: 8021x-radius
-       defaultVlanId: 10
-       enabled: true
-       name: My SSID
-       networkId: "{{network_id}}"
-       number: 1234
-       radiusServers:
-       - host: 1.2.3.4
-         port: 1000
-         secret: secret
-       visible: true
-       wpaEncryptionMode: WPA2 only
-
+        meraki_suppress_logging: false
+        state: present
+        authMode: 8021x-radius
+        defaultVlanId: 10
+        enabled: true
+        name: My SSID
+        networkId: "{{ network_id }}"
+        number: 1234
+        radiusServers:
+          - host: 1.2.3.4
+            port: 1000
+            secret: secret
+        visible: true
+        wpaEncryptionMode: WPA2 only
     - name: Update appliance traffic shaping
       cisco.meraki.networks_appliance_traffic_shaping:
         state: present
         globalBandwidthLimits:
           limitDown: 5120
           limitUp: 2048
-        networkId: "{{network_id}}"
-
+        networkId: "{{ network_id }}"
     - name: Update appliance ports
       cisco.meraki.networks_appliance_ports:
-        allowedVlans: "all"
+        allowedVlans: all
         enabled: true
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         portId: "4"
-        type: "trunk"
+        type: trunk
         vlan: 10
         state: present
-
     - name: Create FW outbound L3 rules
       cisco.meraki.networks_appliance_firewall_l3_firewall_rules:
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         state: present
         rules:
           - comment: Block internetbadguys.com
@@ -73,35 +61,31 @@
             protocol: any
             srcCidr: any
             syslogEnabled: false
-
     - name: Create FW inbound L3 rules
       cisco.meraki.networks_appliance_firewall_inbound_firewall_rules:
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         rules:
-        - comment: Allow HTTP traffic to VLAN 1234 with HTTP servers.
-          destCidr: VLAN(1234).*
-          destPort: '80'
-          policy: allow
-          protocol: tcp
-          srcCidr: Any
-          srcPort: Any
-          syslogEnabled: false
-
+          - comment: Allow HTTP traffic to VLAN 1234 with HTTP servers.
+            destCidr: VLAN(1234).*
+            destPort: "80"
+            policy: allow
+            protocol: tcp
+            srcCidr: Any
+            srcPort: Any
+            syslogEnabled: false
     - name: Create FW L7 rules
       cisco.meraki.networks_appliance_firewall_l7_firewall_rules:
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         rules:
-        - policy: deny
-          type: applicationCategory
-          value: 
-            name: Sports
-            id: meraki:layer7/category/5
-
+          - policy: deny
+            type: applicationCategory
+            value:
+              name: Sports
+              id: meraki:layer7/category/5
     - name: Get all networks _appliance _firewall l3firewallrules
       cisco.meraki.networks_appliance_firewall_l3_firewall_rules_info:
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/network_devices_claim.yml b/playbooks/network_devices_claim.yml
index 757a0a20d..eac378d53 100644
--- a/playbooks/network_devices_claim.yml
+++ b/playbooks/network_devices_claim.yml
@@ -1,11 +1,12 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    network_id: "L_828099381482771185" # Branch-1234
+    network_id: L_828099381482771185
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.networks_devices_claim:
         meraki_output_log: true
-        networkId: "{{network_id}}"
+        networkId: "{{ network_id }}"
         serials:
-        - QBSD-WABS-BH7V
\ No newline at end of file
+          - QBSD-WABS-BH7V
diff --git a/playbooks/networks.yml b/playbooks/networks.yml
index 8cf0077f8..5aa47c928 100644
--- a/playbooks/networks.yml
+++ b/playbooks/networks.yml
@@ -1,68 +1,17 @@
----
-# - hosts: localhost
-#   gather_facts: false
-#   tasks:
-#     - name: Get all networks
-#       cisco.meraki.networks_info:
-#         # configTemplateId: string
-#         # isBoundToConfigTemplate: True
-#         # tags: []
-#         # tagsFilterType: string
-#         # perPage: 0
-#         # startingAfter: string
-#         # endingBefore: string
-#         organizationId: "828099381482762270"
-#       register: result
-#     - name: Get all networks2
-#       cisco.meraki.networks_clients_info:
-#         # configTemplateId: string
-#         # isBoundToConfigTemplate: True
-#         # tags: []
-#         # tagsFilterType: string
-#         # perPage: 0
-#         # startingAfter: string
-#         # endingBefore: string
-#         # organizationId: "828099381482762270"
-#         networkId: "{{item.id}}"
-#       loop: "{{result.meraki_response}}"
-#       register: result2
-
-#     - name: Show result
-#       ansible.builtin.debug:
-#         msg: "{{ result2 }}"
-
-
-    # - name: Create
-    #   cisco.meraki.networks:
-    #     meraki_suppress_logging: true
-    #     state: present
-    #     # copyFromNetworkId: N_24329156
-    #     name: Site 1
-    #     notes: Additional description of the network 212
-    #     organizationId: "828099381482762270"
-    #     productTypes:
-    #     - camera
-    #     - switch
-    #     - wireless
-    #     tags:
-    #     - tag1
-    #     - tag3
-    #     timeZone: America/Los_Angeles
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    org_id: 828099381482762270 
+    org_id: 828099381482762270
   gather_facts: false
   tasks:
-
-  - name: Createa a new network
-    cisco.meraki.networks:
-      meraki_suppress_logging: false
-      state: present
-      name: New network by Ansible
-      notes: Additional description of the network
-      organizationId: "{{ org_id }}"
-      productTypes:
-      - appliance
-      - switch
-      timeZone: America/Los_Angeles 
\ No newline at end of file
+    - name: Createa a new network
+      cisco.meraki.networks:
+        meraki_suppress_logging: false
+        state: present
+        name: New network by Ansible
+        notes: Additional description of the network
+        organizationId: "{{ org_id }}"
+        productTypes:
+          - appliance
+          - switch
+        timeZone: America/Los_Angeles
diff --git a/playbooks/networks_appliance_vlans.yml b/playbooks/networks_appliance_vlans.yml
index 2b45e3d65..297d0a7f0 100644
--- a/playbooks/networks_appliance_vlans.yml
+++ b/playbooks/networks_appliance_vlans.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
@@ -8,22 +8,22 @@
         state: present
         applianceIp: 192.168.1.2
         cidr: 192.168.1.0/24
-        groupPolicyId: '101'
-        id: '1234'
+        groupPolicyId: "101"
+        id: "1234"
         ipv6:
           enabled: true
           prefixAssignments:
-          - autonomous: false
-            origin:
-              interfaces:
-              - wan0
-              type: internet
-            staticApplianceIp6: 2001:db8:3c4d:15::1
-            staticPrefix: 2001:db8:3c4d:15::/64
+            - autonomous: false
+              origin:
+                interfaces:
+                  - wan0
+                type: internet
+              staticApplianceIp6: 2001:db8:3c4d:15::1
+              staticPrefix: 2001:db8:3c4d:15::/64
         mandatoryDhcp:
           enabled: true
         mask: 28
         name: My VLAN
         networkId: L_828099381482770865
         subnet: 192.168.1.0/24
-        templateVlanType: same
\ No newline at end of file
+        templateVlanType: same
diff --git a/playbooks/networks_devices_remove.yml b/playbooks/networks_devices_remove.yml
index 5fef8d71a..6db13b2ee 100644
--- a/playbooks/networks_devices_remove.yml
+++ b/playbooks/networks_devices_remove.yml
@@ -1,9 +1,10 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    network_id: "L_828099381482771185" # Branch-1234
+    network_id: L_828099381482771185
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.networks_devices_remove:
         networkId: L_828099381482771185
-        serial: QBSD-WABS-BH7V
\ No newline at end of file
+        serial: QBSD-WABS-BH7V
diff --git a/playbooks/networks_wireless_ssids_identityPsks.yml b/playbooks/networks_wireless_ssids_identityPsks.yml
index 014aa7a8c..739ea304b 100644
--- a/playbooks/networks_wireless_ssids_identityPsks.yml
+++ b/playbooks/networks_wireless_ssids_identityPsks.yml
@@ -1,15 +1,13 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.networks_wireless_ssids_identity_psks:
         meraki_suppress_logging: true
         state: present
-        expiresAt: '2018-02-11T00:00:00.090209Z'
-        groupPolicyId: '101'
-        # identityPskId: '1284392014819'
+        expiresAt: "2018-02-11T00:00:00.090209Z"
+        groupPolicyId: "101"
         name: Sample Identity PSK
         networkId: L_828099381482771185
         number: 1
-        # passphrase: secrethguygyu
diff --git a/playbooks/old_collection_test.yml b/playbooks/old_collection_test.yml
deleted file mode 100644
index aa72eea43..000000000
--- a/playbooks/old_collection_test.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- name: Configure Switchports with async API
-  hosts: localhost
-  connection: local
-  vars:
-    sn: Q3EA-239B-ZQV7
-    auth_key: <ACB>
-    org_name: Test Ansible
-    switchports:
-      - name: WAN Trunk1
-        type: trunk
-        allowedVlans: "1,2,19,20,50"
-
-  collections:
-    - cisco.meraki
-  tasks:
-
-  - name: Configure switchports
-    meraki_ms_switchport:
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ org_name }}"
-      serial: "{{ sn }}"
-      number: "{{ ansible_loop.index }}"
-      name: "{{ item.name }}"
-      type: "{{ item.type }}"
-      enabled: "{{ item.enabled | default(omit) }}"
-      vlan: "{{ item.vlan | default(omit) }}"
-      allowed_vlans: "{{ omit if item.allowedVlans is undefined else item.allowedVlans.split(',')}}"
-      voice_vlan: "{{ item.voiceVlan | default(omit) }}"
-      access_policy_type: "{{ item.accessPolicyType | default(omit) }}"
-      access_policy_number: "{{ item.accessPolicyNumber | default(omit) }}"
-      state: present
-    loop: "{{ switchports }}"
-    loop_control:
-      extended: yes
-      label: "{{ item.name }}"
-      pause: 0.3
-    register: async_results
-    # async: 120
-    # poll: 0
-    tags: [always]
\ No newline at end of file
diff --git a/playbooks/organization.yml b/playbooks/organization.yml
index dddda64ed..714c7423b 100644
--- a/playbooks/organization.yml
+++ b/playbooks/organization.yml
@@ -1,21 +1,15 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.organizations:
         meraki_suppress_logging: true
-        # meraki_username: "{{meraki_username}}"
-        # meraki_password: "{{meraki_password}}"
-        # meraki_verify: "{{meraki_verify}}"
-        # meraki_port: "{{meraki_port}}"
-        # meraki_version: "{{meraki_version}}"
-        # meraki_debug: "{{meraki_debug}}"
         state: present
         management:
           details:
-          - name: MSP ID
-            value: '1234567'
+            - name: MSP ID
+              value: "1234567"
         name: Test Ansible
         api:
-          enabled: True
+          enabled: true
diff --git a/playbooks/organization_info.yml b/playbooks/organization_info.yml
index 79a1cbcb9..ee4157d42 100644
--- a/playbooks/organization_info.yml
+++ b/playbooks/organization_info.yml
@@ -1,20 +1,12 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all Organizations
       cisco.meraki.organizations_info:
         meraki_suppress_logging: false
-        # meraki_username: "{{meraki_username}}"
-        # meraki_password: "{{meraki_password}}"
-        # meraki_verify: "{{meraki_verify}}"
-        # meraki_port: "{{meraki_port}}"
-        # meraki_version: "{{meraki_version}}"
-        # meraki_debug: "{{meraki_debug}}"
-        # headers: "{{my_headers | from_json}}"
         organizationId: "828099381482762766"
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/organization_summary.yml b/playbooks/organization_summary.yml
index 94893b68a..047558be8 100644
--- a/playbooks/organization_summary.yml
+++ b/playbooks/organization_summary.yml
@@ -1,70 +1,55 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
     org_id: "828099381482762270"
   gather_facts: false
   tasks:
-
-  - name: Get all organizations summary top appliances by utilization
-    cisco.meraki.organizations_summary_top_appliances_by_utilization_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top clients by usage
-    cisco.meraki.organizations_summary_top_clients_by_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top clients by manufacturers
-    cisco.meraki.organizations_summary_top_clients_manufacturers_by_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top devices by usage
-    cisco.meraki.organizations_summary_top_devices_by_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top devices by models
-    cisco.meraki.organizations_summary_top_devices_models_by_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top SSIDs by usage
-    cisco.meraki.organizations_summary_top_ssids_by_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Get all organizations summary top switches by energy usage
-    cisco.meraki.organizations_summary_top_switches_by_energy_usage_info:
-      organizationId: "{{ org_id }}"
-    register: result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
+    - name: Get all organizations summary top appliances by utilization
+      cisco.meraki.organizations_summary_top_appliances_by_utilization_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top clients by usage
+      cisco.meraki.organizations_summary_top_clients_by_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top clients by manufacturers
+      cisco.meraki.organizations_summary_top_clients_manufacturers_by_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top devices by usage
+      cisco.meraki.organizations_summary_top_devices_by_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top devices by models
+      cisco.meraki.organizations_summary_top_devices_models_by_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top SSIDs by usage
+      cisco.meraki.organizations_summary_top_ssids_by_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Get all organizations summary top switches by energy usage
+      cisco.meraki.organizations_summary_top_switches_by_energy_usage_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
diff --git a/playbooks/organizations_adaptivePolicy_acls.yml b/playbooks/organizations_adaptivePolicy_acls.yml
index e76e33c1d..ae98ac10f 100644
--- a/playbooks/organizations_adaptivePolicy_acls.yml
+++ b/playbooks/organizations_adaptivePolicy_acls.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
@@ -11,7 +11,7 @@
         name: Block sensitive web traffic
         organizationId: "828099381482762270"
         rules:
-        - dstPort: 22-30
-          policy: deny
-          protocol: tcp
-          srcPort: 1,33
+          - dstPort: 22-30
+            policy: deny
+            protocol: tcp
+            srcPort: 1,33
diff --git a/playbooks/organizations_adaptive_policy_groups.yml b/playbooks/organizations_adaptive_policy_groups.yml
index 39abc8dbb..3851dfbed 100644
--- a/playbooks/organizations_adaptive_policy_groups.yml
+++ b/playbooks/organizations_adaptive_policy_groups.yml
@@ -1,17 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.organizations_adaptive_policy_groups:
         meraki_suppress_logging: true
         state: present
-        # description: Group of XYZ Corp Employees
-        # isDefaultGroup: false
         name: Employee Group
         organizationId: "828099381482762270"
-        # policyObjects:
-        # - id: '2345'
-        #   name: Example Policy Object
-        # requiredIpMappings: []
-        sgt: 10005
\ No newline at end of file
+        sgt: 10005
diff --git a/playbooks/organizations_admin copy.yml b/playbooks/organizations_admin copy.yml
index 3a720877e..0b71279ff 100644
--- a/playbooks/organizations_admin copy.yml	
+++ b/playbooks/organizations_admin copy.yml	
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars_files:
     - credentials.yml
   gather_facts: false
@@ -15,14 +15,8 @@
           lng: 8
         center:
           lat: 7
-          lng: 1 
+          lng: 1
         floorPlanId: string
         imageContents: Q2lzY28gTWVyYWtp.png
         name: Test
         networkId: L_828099381482770942
-        # topLeftCorner:
-        #   lat: 0
-        #   lng: 0
-        # topRightCorner:
-        #   lat: 0
-        #   lng: 0
\ No newline at end of file
diff --git a/playbooks/organizations_admin.yml b/playbooks/organizations_admin.yml
index 110620ce0..7a745b840 100644
--- a/playbooks/organizations_admin.yml
+++ b/playbooks/organizations_admin.yml
@@ -1,11 +1,10 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.organizations_admins:
         meraki_suppress_logging: true
-        # 
         state: present
         name: DevNet Admin 345
         email: devnetmerakiadmin23@yopmail.com
@@ -14,19 +13,3 @@
         networks: []
         tags: []
         organizationId: "828099381482762270"
-        
-  #       - name: Create
-  # cisco.meraki.organizations_admins:
-  #   meraki_host: "{{meraki_host}}"
-  #   state: present
-  #   authenticationMethod: Email
-  #   email: miles@meraki.com
-  #   name: Miles Meraki
-  #   networks:
-  #   - access: full
-  #     id: N_24329156
-  #   orgAccess: none
-  #   organizationId: string
-  #   tags:
-  #   - access: read-only
-  #     tag: west
\ No newline at end of file
diff --git a/playbooks/organizations_admin_info.yml b/playbooks/organizations_admin_info.yml
index aa4b46896..87dee4af7 100644
--- a/playbooks/organizations_admin_info.yml
+++ b/playbooks/organizations_admin_info.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all Organizations Admins
@@ -7,7 +7,6 @@
         meraki_suppress_logging: true
         organizationId: "828099381482762270"
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/organizations_camera_custom_analytics_artifacts.yml b/playbooks/organizations_camera_custom_analytics_artifacts.yml
index 8a4b063f5..4ff09eadb 100644
--- a/playbooks/organizations_camera_custom_analytics_artifacts.yml
+++ b/playbooks/organizations_camera_custom_analytics_artifacts.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
@@ -9,10 +9,3 @@
         name: Test Ansible 2
         organizationId: "828099381482762270"
         artifactId: "828099381482750058"
-    # - name: Delete
-    #   cisco.meraki.organizations_camera_custom_analytics_artifacts:
-    #     meraki_api_key: "{{meraki_api_key}}"
-    #     state: absent
-    #     name: Test Ansible
-    #     organizationId: "828099381482762270"
-    #     artifactId: "828099381482750043"
diff --git a/playbooks/organizations_clients_search_info.yml b/playbooks/organizations_clients_search_info.yml
index b4e566166..cc549f389 100644
--- a/playbooks/organizations_clients_search_info.yml
+++ b/playbooks/organizations_clients_search_info.yml
@@ -1,14 +1,12 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all organizations _clients _search
       cisco.meraki.organizations_clients_search_info:
         meraki_suppress_logging: true
-        mac: "4c:c8:a1:01:01:c2"
+        mac: 4c:c8:a1:01:01:c2
         perPage: 3
         total_pages: -1
-        # startingAfter: string
-        # endingBefore: string
         organizationId: "828099381482762270"
-      register: result
\ No newline at end of file
+      register: result
diff --git a/playbooks/organizations_config_templates.yml b/playbooks/organizations_config_templates.yml
index 775145b10..b9dd69f7e 100644
--- a/playbooks/organizations_config_templates.yml
+++ b/playbooks/organizations_config_templates.yml
@@ -1,30 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
       cisco.meraki.organizations_config_templates:
         meraki_suppress_logging: true
         state: present
-        name: "My config template"
+        name: My config template
         organizationId: "828099381482762270"
-        timeZone: "America/Los_Angeles"
-
-    # - name: Update by id
-    #   cisco.meraki.organizations_config_templates:
-    #     meraki_suppress_logging: true
-    #     state: present
-    #     configTemplateId: string
-    #     name: My config template
-    #     organizationId: "828099381482762270"
-    #     timeZone: America/Los_Angeles
-
-    # - name: Delete by id
-    #   cisco.meraki.organizations_config_templates:
-    #     meraki_suppress_logging: true
-    #     
-    #     meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    #     meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-    #     state: absent
-    #     configTemplateId: "L_828099381482770921"
-    #     organizationId: "828099381482762270"
+        timeZone: America/Los_Angeles
diff --git a/playbooks/organizations_config_templates_info.yml b/playbooks/organizations_config_templates_info.yml
index e0dbe1ce8..a33896f89 100644
--- a/playbooks/organizations_config_templates_info.yml
+++ b/playbooks/organizations_config_templates_info.yml
@@ -1,9 +1,9 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all organizations _configtemplates
       cisco.meraki.organizations_config_templates_info:
         meraki_suppress_logging: true
         organizationId: "828099381482762270"
-      register: result
\ No newline at end of file
+      register: result
diff --git a/playbooks/organizations_devices_info.yml b/playbooks/organizations_devices_info.yml
index c5da1af5c..18b4deea0 100644
--- a/playbooks/organizations_devices_info.yml
+++ b/playbooks/organizations_devices_info.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Get all organizations _devices
@@ -7,21 +7,7 @@
         meraki_suppress_logging: true
         perPage: 3
         total_pages: -1
-        # startingAfter: string
-        # endingBefore: string
-        # configurationUpdatedAfter: string
-        # networkIds: []
-        # productTypes: []
-        # tags: []
-        # tagsFilterType: string
-        # name: string
-        # mac: string
-        # serial: string
-        # model: string
-        # macs: []
-        # serials: []
-        # sensorMetrics: []
-        # sensorAlertProfileIds: []
-        models: ["MV12N"]
+        models:
+          - MV12N
         organizationId: "828099381482762270"
-      register: result
\ No newline at end of file
+      register: result
diff --git a/playbooks/organizations_login_security.yml b/playbooks/organizations_login_security.yml
index 4b211dc8d..2474f63b5 100644
--- a/playbooks/organizations_login_security.yml
+++ b/playbooks/organizations_login_security.yml
@@ -1,25 +1,21 @@
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    vars:
-    org_id: 828099381482762270 # API TEST
+    org_id: 828099381482762270
   gather_facts: false
   tasks:
-
-  - name: Get security login settings
-    cisco.meraki.organizations_login_security_info:
-      organizationId: "{{ org_id }}"
-    register:
-      result
-
-  - name: Show result
-    ansible.builtin.debug:
-      msg: "{{ result }}"
-
-  - name: Update security login settings
-    cisco.meraki.organizations_login_security:
-      meraki_suppress_logging: false
-      organizationId: "{{ org_id }}"
-      state: present
-      accountLockoutAttempts: 3
-      enforceIdleTimeout: true
-      enforceTwoFactorAuth: true
\ No newline at end of file
+    - name: Get security login settings
+      cisco.meraki.organizations_login_security_info:
+        organizationId: "{{ org_id }}"
+      register: result
+    - name: Show result
+      ansible.builtin.debug:
+        msg: "{{ result }}"
+    - name: Update security login settings
+      cisco.meraki.organizations_login_security:
+        meraki_suppress_logging: false
+        organizationId: "{{ org_id }}"
+        state: present
+        accountLockoutAttempts: 3
+        enforceIdleTimeout: true
+        enforceTwoFactorAuth: true
diff --git a/playbooks/organizations_saml_idps.yml b/playbooks/organizations_saml_idps.yml
index d56cfc090..94407c8ae 100644
--- a/playbooks/organizations_saml_idps.yml
+++ b/playbooks/organizations_saml_idps.yml
@@ -1,5 +1,5 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
     - name: Create
diff --git a/playbooks/switch_port_config.yml b/playbooks/switch_port_config.yml
index 00c43be09..486440e8a 100644
--- a/playbooks/switch_port_config.yml
+++ b/playbooks/switch_port_config.yml
@@ -1,11 +1,11 @@
----
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   gather_facts: false
   tasks:
-    - name: update ports
+    - name: Update ports
       cisco.meraki.devices_switch_ports:
         meraki_suppress_logging: true
         state: present
-        serial: "QBSB-D8ED-9NXT"
+        serial: QBSB-D8ED-9NXT
         vlan: 10
-        portId: 1
\ No newline at end of file
+        portId: 1
diff --git a/playbooks/test.yml b/playbooks/test.yml
index 3fafbf2b5..54b4569e7 100644
--- a/playbooks/test.yml
+++ b/playbooks/test.yml
@@ -1,265 +1,16 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
-    network_id: "L_828099381482771185" # Branch-1234
+    network_id: L_828099381482771185
     org_id: "828099381482762270"
   gather_facts: false
   tasks:
-
-    # - name: Get all networks _appliance _ports
-    #   cisco.meraki.networks_appliance_ports_info:
-    #     networkId: L_828099381482771185
-    #   register: result
-    # - name: update port
-    #   cisco.meraki.devices_switch_ports:
-    #     meraki_suppress_logging: false
-    #     serial: QBSB-BNH2-KDXJ
-    #     portId: 3
-    #     vlan: 50
-    #     # type: access
-    #     state: present
-    #     poeEnabled: false 
-    # - name: Update appliance Vlans
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     applianceIp: 192.168.1.2
-    #     cidr: 192.168.1.0/24
-    #     id: '1234'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 192.168.1.0/24
-
-    # - name: Get all networks _appliance _ssids
-    #   cisco.meraki.networks_appliance_ssids_info:
-    #     networkId: "{{network_id}}"
-    #   register: result
-
-    # - name: Show result
-    #   ansible.builtin.debug:
-    #     msg: "{{ result }}"
-
-    # - name: Update appliance SSID
-    #   cisco.meraki.networks_appliance_ssids:
-    #     state: present
-    #     authMode: 8021x-radius
-    #     defaultVlanId: 10
-    #     enabled: true
-    #     name: My SSID
-    #     networkId: "{{network_id}}"
-    #     number: 1
-    #     radiusServers:
-    #     - host: 1.2.3.4
-    #       port: 1000
-    #       secret: secret
-    #     visible: true
-    #     wpaEncryptionMode: WPA2 only 
-
-
-# ################################################################
-
-    # - name: Update appliance traffic sharping
-    #   cisco.meraki.networks_appliance_traffic_shaping:
-    #     state: present
-    #     globalBandwidthLimits:
-    #       limitDown: 5120
-    #       limitUp: 2048
-    #     networkId: "{{network_id}}"
-
-    # - name: Enable Vlans on the MX
-    #   cisco.meraki.networks_appliance_vlans_settings:
-    #     state: present
-    #     networkId: "{{network_id}}"
-    #     vlansEnabled: true
-
-    # - name: Update appliance ports
-    #   cisco.meraki.networks_appliance_ports:
-    #     accessPolicy: "open"
-    #     allowedVlans: "all"
-    #     enabled: true
-    #     networkId: "{{network_id}}"
-    #     portId: "2"
-    #     type: "trunk"
-    #     vlan: 10
-    #     state: present
-    # - name: Get all networks
-    #   cisco.meraki.networks_info:
-    #     organizationId: "{{org_id}}"
-    #     total_pages: -1
-    #     direction: next
-    #   register: result
-
-    # - name: Show result
-    #   ansible.builtin.debug:
-    #     msg: "{{ result.meraki_response[0].id }}"
-    
-    # - name: Bind a template from a network
-    #   meraki_config_template:
-    #     auth_key: "{{ meraki_api_key }}"
-    #     state: present
-    #     org_id: "{{ org_name }}"
-    #     net_id: "{{ off_network.results.0.meraki_response.id }}"
-    #     config_template: "{{ item.value.template_name }}"
-    #   delegate_to: localhost
-    #   loop: "{{ lookup('dict', devices) }}"
-  
-  
-    # - name: Create
-    #   cisco.meraki.organizations_config_templates:
-    #     # meraki_api_key: "{{meraki_api_key}}"
-    #     state: present
-    #     name: My config template
-    #     organizationId: "{{ org_id }}"
-    #   register: result
-
-    # - name: Create
-    #   cisco.meraki.networks_bind:
-    #     autoBind: false
-    #     configTemplateId: "{{result.meraki_response.id}}"
-    #     networkId: "{{network_id}}"
-
-
-    # - name: change name of device
-    #   cisco.meraki.devices:
-    #     name: new name 4
-    #     serial: QBSB-D5ZD-9CXT
-    #     # organizationId: "{{org_id}}"
-    #     state: present 
-    #     meraki_suppress_logging: false
-
-    # - name: onboard order
-    #   cisco.meraki.organizations_inventory_claim:
-    #     # meraki_api_key: "{{ meraki_api }}"
-    #     # meraki_simulate: "{{ testpolicy }}"
-    #     organizationId: "{{ org_id }}"
-    #     orders: "1"
-    
-
-    # - name: Enable Vlans on the MX
-    #   cisco.meraki.networks_appliance_vlans_settings:
-    #     state: present
-    #     networkId: "{{network_id}}"
-    #     vlansEnabled: true
-
-    # - name: Create appliance Vlan 100
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     applianceIp: 192.168.1.2
-    #     cidr: 192.168.1.0/24
-    #     id: '100'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 192.168.1.0/24
-
-    # - name: Create appliance Vlan 200
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     applianceIp: 192.168.2.2
-    #     cidr: 192.168.2.0/24
-    #     id: '200'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 192.168.2.0/24
-
-    # - name: Create appliance Vlan 300
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     applianceIp: 192.168.3.2
-    #     cidr: 192.168.3.0/24
-    #     id: '300'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 192.168.3.0/24 
-
-
-    # - name: Enable Vlans on the MX
-    #   cisco.meraki.networks_appliance_vlans_settings:
-    #     state: present
-    #     networkId: "{{network_id}}"
-    #     vlansEnabled: true
-
-    # - name: Create appliance Vlan 100
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     meraki_suppress_logging: false
-    #     applianceIp: 10.1.0.2
-    #     cidr: 10.1.0.0/17
-    #     id: '100'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 10.1.0.0/17
-
-    # - name: Create appliance Vlan 200
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     meraki_suppress_logging: false
-    #     applianceIp: 172.200.0.2
-    #     cidr: 172.200.0.0/20
-    #     id: '200'
-    #     name: My VLAN
-    #     networkId: "{{network_id}}"
-    #     subnet: 172.200.0.0/20
-
-    # - name: Create appliance Vlan 300
-    #   cisco.meraki.networks_appliance_vlans:
-    #     state: present
-    #     meraki_suppress_logging: false
-    #     applianceIp: 172.16.0.2
-    #     cidr: 172.16.0.0/24
-    #     id: 300
-    #     name: My VLAN 2
-    #     networkId: "{{network_id}}"
-    #     subnet: 172.16.0.0/24
-
-  
-  # - name: Get all organizations _appliance _vpn _thirdpartyvpnpeers
-  #   cisco.meraki.organizations_appliance_vpn_third_party_vpnpeers_info:
-  #     meraki_suppress_logging: false
-  #     organizationId: "828099381482762270"
-  #   register: result
-
-  # - name: Show result
-  #   ansible.builtin.debug:
-  #     msg: "{{ result }}" 
-
-
-  # - name: Get all networks _appliance _trafficshaping _customperformanceclasses
-  #   cisco.meraki.networks_appliance_traffic_shaping_custom_performance_classes_info:
-  #     networkId: L_828099381482771185
-  #   register: result
-
-  # - name: Show result
-  #   ansible.builtin.debug:
-  #     msg: "{{ result }}" 
-
-  # - name: Create
-  #   cisco.meraki.networks_switch_stacks:
-  #     state: present
-  #     meraki_suppress_logging: false
-  #     name: A cool stack
-  #     networkId: "{{network_id}}"
-  #     serials:
-  #     - QBSB-BNH2-KDXJ
-
-  - name: Get all networks _clients
-    cisco.meraki.networks_clients_info:
-      # t0: string
-      meraki_suppress_logging: false
-      timespan: 1
-      perPage: 3
-      # startingAfter: string
-      # endingBefore: string
-      # statuses: []
-      # ip: string
-      # ip6: string
-      # ip6Local: string
-      # mac: string
-      # os: string
-      # pskGroup: string
-      # description: string
-      # vlan: string
-      # recentDeviceConnections: []
-      networkId: L_828099381482771185
-      total_pages: -1
-      direction: next
-    register: result
\ No newline at end of file
+    - name: Get all networks _clients
+      cisco.meraki.networks_clients_info:
+        meraki_suppress_logging: false
+        timespan: 1
+        perPage: 3
+        networkId: L_828099381482771185
+        total_pages: -1
+        direction: next
+      register: result
diff --git a/playbooks/who_am_i.yml b/playbooks/who_am_i.yml
index c6f5acb30..347fc5d00 100644
--- a/playbooks/who_am_i.yml
+++ b/playbooks/who_am_i.yml
@@ -1,11 +1,10 @@
----
-- hosts: meraki_servers
+- name: Play Name
+  hosts: meraki_servers
   gather_facts: false
   tasks:
     - name: Get my administered identities
-      cisco.meraki.administered_identities_me_info:
+      cisco.meraki.administered_identities_me_info: null
       register: result
-
     - name: Show result
       ansible.builtin.debug:
         msg: "{{ result }}"
diff --git a/playbooks/wifi_deploy_one.yml b/playbooks/wifi_deploy_one.yml
index 4047c9085..fd99bcc7e 100644
--- a/playbooks/wifi_deploy_one.yml
+++ b/playbooks/wifi_deploy_one.yml
@@ -1,18 +1,16 @@
----
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars:
     org_id: "828099381482762270"
-    corp_name: "ACME"
-    network_id: "L_828099381482770865"
+    corp_name: ACME
+    network_id: L_828099381482770865
   gather_facts: false
   tasks:
-
     - name: Create corporate SSID
       cisco.meraki.networks_wireless_ssids:
         meraki_suppress_logging: true
         state: present
         enabled: true
-        name: "{{corp_name}}"
+        name: "{{ corp_name }}"
         networkId: "{{ network_id }}"
         number: "1"
diff --git a/playbooks/wifi_deployment.yml b/playbooks/wifi_deployment.yml
index 80314a1c1..6cb6c1f02 100644
--- a/playbooks/wifi_deployment.yml
+++ b/playbooks/wifi_deployment.yml
@@ -1,53 +1,45 @@
----
-# This playbook will create 3 WiFi networks across all networks in a given Meraki organization:
-# 1. Corporate (802.1x) on vlan 100
-# 2. Mobile (WPA-PSK) on vlan 200
-# 3. Guests (Portal) on vlan 300
-
-- hosts: localhost
+- name: Play Name
+  hosts: localhost
   vars_files:
     - credentials.yml
   vars:
     org_id: "828099381482762270"
-    corp_name: "Umbrella Corp"
+    corp_name: Umbrella Corp
   gather_facts: false
   tasks:
-
     - name: Get Organization Networks
       cisco.meraki.networks_info:
         organizationId: "{{ org_id }}"
       register: result
-
     - name: Filter networks with "wireless" productTypes
-      set_fact:
-        filtered_networks: "{{ result.meraki_response | selectattr('productTypes', 'contains', 'wireless') | list }}"
-
+      ansible.builtin.set_fact:
+        filtered_networks:
+          "{{ result.meraki_response | selectattr('productTypes',
+          'contains', 'wireless') | list }}"
     - name: Create corporate SSID
       cisco.meraki.networks_wireless_ssids:
         state: present
         enabled: true
-        name: "{{corp_name}}"
+        name: "{{ corp_name }}"
         networkId: "{{ item.id }}"
         number: 1
         ipAssignmentMode: Bridge mode
         defaultVlanId: 100
         useVlanTagging: true
-        authMode: "8021x-radius"
-        radiusServers: 
-          - one:
-            host: "1.2.3.4"
+        authMode: 8021x-radius
+        radiusServers:
+          - one: null
+            host: 1.2.3.4
             port: 1812
             secret: SuperSecretPassword
-
       loop: "{{ filtered_networks }}"
       loop_control:
         label: "{{ item.id }}"
-
     - name: Create Mobile/PSK SSID
       cisco.meraki.networks_wireless_ssids:
         state: present
         enabled: true
-        name: "{{corp_name}}-legacy"
+        name: "{{ corp_name }}-legacy"
         networkId: "{{ item.id }}"
         number: 2
         ipAssignmentMode: Bridge mode
@@ -56,24 +48,21 @@
         authMode: psk
         encryptionMode: wpa
         psk: SuperSecretPreSharedKey
-
       loop: "{{ filtered_networks }}"
       loop_control:
         label: "{{ item.id }}"
-
     - name: Create Guest SSID
       cisco.meraki.networks_wireless_ssids:
         state: present
         enabled: true
-        name: "{{corp_name}}-Guests"
+        name: "{{ corp_name }}-Guests"
         networkId: "{{ item.id }}"
         number: 3
         ipAssignmentMode: Bridge mode
         defaultVlanId: 300
         useVlanTagging: true
-        authMode: "open"
+        authMode: open
         splashPage: Click-through splash page
-
       loop: "{{ filtered_networks }}"
       loop_control:
         label: "{{ item.id }}"
diff --git a/plugins/doc_fragments/meraki.py b/plugins/doc_fragments/meraki.py
index d6d456f19..38178f2f5 100644
--- a/plugins/doc_fragments/meraki.py
+++ b/plugins/doc_fragments/meraki.py
@@ -22,7 +22,7 @@ class ModuleDocFragment(object):
         description:
         - Authentication key provided by the dashboard. Required if environmental variable C(MERAKI_KEY) is not set.
         type: str
-        required: yes
+        required: true
     host:
         description:
         - Hostname for Meraki dashboard.
@@ -33,13 +33,13 @@ class ModuleDocFragment(object):
         description:
         - If C(no), it will not use a proxy, even if one is defined in an environment variable on the target hosts.
         type: bool
-        default: False
+        default: false
     use_https:
         description:
         - If C(no), it will use HTTP. Otherwise it will use HTTPS.
         - Only useful for internal Meraki developers.
         type: bool
-        default: yes
+        default: true
     output_format:
         description:
         - Instructs module whether response keys should be snake case (ex. C(net_id)) or camel case (ex. C(netId)).
@@ -61,7 +61,7 @@ class ModuleDocFragment(object):
         description:
         - Whether to validate HTTP certificates.
         type: bool
-        default: yes
+        default: true
     org_name:
         description:
         - Name of organization.
diff --git a/plugins/modules/administered_identities_me_api_keys_generate.py b/plugins/modules/administered_identities_me_api_keys_generate.py
index 80132fea3..35b8e3da3 100644
--- a/plugins/modules/administered_identities_me_api_keys_generate.py
+++ b/plugins/modules/administered_identities_me_api_keys_generate.py
@@ -5,59 +5,58 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_identities_me_api_keys_generate
-short_description: Resource module for administered _identities _me _api _keys _generate
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource administered _identities _me _api _keys _generate.
-- >
-   Generates an API key for an identity. For users who have access to more than one organization, the change will
-   take up to five minutes to propagate. If one of the organizations is currently under maintenance, the change may
-   not propagate fully until after the maintenance has been completed.
-version_added: '2.20.0'
+  - Manage operation create of the resource administered _identities _me _api _keys
+    _generate.
+  - 'Generates an API key for an identity. For users who have access to more than
+    one organization, the change will take up to five minutes to propagate. If one
+    of the organizations is currently under maintenance, the change may not propagate
+    fully until after the maintenance has been completed.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: administered_identities_me_api_keys_generate
+notes:
+  - SDK Method used are administered.Administered.generate_administered_identities_me_api_keys,
+  - Paths used are post /administered/identities/me/api/keys/generate,
 options: {}
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for administered generateAdministeredIdentitiesMeApiKeys
-  description: Complete reference of the generateAdministeredIdentitiesMeApiKeys API.
-  link: https://developer.cisco.com/meraki/api-v1/#!generate-administered-identities-me-api-keys
-notes:
-  - SDK Method used are
-    administered.Administered.generate_administered_identities_me_api_keys,
-
-  - Paths used are
-    post /administered/identities/me/api/keys/generate,
+  - description: Complete reference of the generateAdministeredIdentitiesMeApiKeys
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!generate-administered-identities-me-api-keys
+    name: Cisco Meraki documentation for administered generateAdministeredIdentitiesMeApiKeys
+short_description: Resource module for administered _identities _me _api _keys _generate
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.administered_identities_me_api_keys_generate:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_identities_me_api_keys_info.py b/plugins/modules/administered_identities_me_api_keys_info.py
index 6c4fc2f2c..e1dad46bb 100644
--- a/plugins/modules/administered_identities_me_api_keys_info.py
+++ b/plugins/modules/administered_identities_me_api_keys_info.py
@@ -5,60 +5,56 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_identities_me_api_keys_info
-short_description: Information module for administered _identities _me _api _keys
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all administered _identities _me _api _keys.
-- List the non-sensitive metadata associated with the API keys that belong to the user.
-version_added: '2.20.0'
+  - Get all administered _identities _me _api _keys.
+  - List the non-sensitive metadata associated with the API keys that belong to the
+    user.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: administered_identities_me_api_keys_info
+notes:
+  - SDK Method used are administered.Administered.get_administered_identities_me_api_keys,
+  - Paths used are get /administered/identities/me/api/keys,
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for administered getAdministeredIdentitiesMeApiKeys
-  description: Complete reference of the getAdministeredIdentitiesMeApiKeys API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-administered-identities-me-api-keys
-notes:
-  - SDK Method used are
-    administered.Administered.get_administered_identities_me_api_keys,
-
-  - Paths used are
-    get /administered/identities/me/api/keys,
+  - description: Complete reference of the getAdministeredIdentitiesMeApiKeys API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-administered-identities-me-api-keys
+    name: Cisco Meraki documentation for administered getAdministeredIdentitiesMeApiKeys
+short_description: Information module for administered _identities _me _api _keys
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all administered _identities _me _api _keys
   cisco.meraki.administered_identities_me_api_keys_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_identities_me_api_keys_revoke.py b/plugins/modules/administered_identities_me_api_keys_revoke.py
index 586add3ed..bbd01012a 100644
--- a/plugins/modules/administered_identities_me_api_keys_revoke.py
+++ b/plugins/modules/administered_identities_me_api_keys_revoke.py
@@ -5,63 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_identities_me_api_keys_revoke
-short_description: Resource module for administered _identities _me _api _keys _revoke
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource administered _identities _me _api _keys _revoke.
-- >
-   Revokes an identity's API key, using the last four characters of the key. For users who have access to more than
-   one organization, the change will take up to five minutes to propagate. If one of the organizations is currently
-   under maintenance, the change may not propagate fully until after the maintenance has been completed.
-version_added: '2.20.0'
+  - Manage operation create of the resource administered _identities _me _api _keys
+    _revoke.
+  - 'Revokes an identity''s API key, using the last four characters of the key. For
+    users who have access to more than one organization, the change will take up to
+    five minutes to propagate. If one of the organizations is currently under maintenance,
+    the change may not propagate fully until after the maintenance has been completed.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: administered_identities_me_api_keys_revoke
+notes:
+  - SDK Method used are administered.Administered.revoke_administered_identities_me_api_keys,
+  - Paths used are post /administered/identities/me/api/keys/{suffix}/revoke,
 options:
   suffix:
     description: Suffix path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for administered revokeAdministeredIdentitiesMeApiKeys
-  description: Complete reference of the revokeAdministeredIdentitiesMeApiKeys API.
-  link: https://developer.cisco.com/meraki/api-v1/#!revoke-administered-identities-me-api-keys
-notes:
-  - SDK Method used are
-    administered.Administered.revoke_administered_identities_me_api_keys,
-
-  - Paths used are
-    post /administered/identities/me/api/keys/{suffix}/revoke,
+  - description: Complete reference of the revokeAdministeredIdentitiesMeApiKeys API.
+    link: https://developer.cisco.com/meraki/api-v1/#!revoke-administered-identities-me-api-keys
+    name: Cisco Meraki documentation for administered revokeAdministeredIdentitiesMeApiKeys
+short_description: Resource module for administered _identities _me _api _keys _revoke
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.administered_identities_me_api_keys_revoke:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     suffix: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_identities_me_info.py b/plugins/modules/administered_identities_me_info.py
index 7f833e0d8..df54d69e8 100644
--- a/plugins/modules/administered_identities_me_info.py
+++ b/plugins/modules/administered_identities_me_info.py
@@ -5,60 +5,55 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_identities_me_info
-short_description: Information module for administered _identities _me
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all administered _identities _me.
-- Returns the identity of the current user.
-version_added: '2.16.0'
+  - Get all administered _identities _me.
+  - Returns the identity of the current user.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: administered_identities_me_info
+notes:
+  - SDK Method used are administered.Administered.get_administered_identities_me,
+  - Paths used are get /administered/identities/me,
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for administered getAdministeredIdentitiesMe
-  description: Complete reference of the getAdministeredIdentitiesMe API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-administered-identities-me
-notes:
-  - SDK Method used are
-    administered.Administered.get_administered_identities_me,
-
-  - Paths used are
-    get /administered/identities/me,
+  - description: Complete reference of the getAdministeredIdentitiesMe API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-administered-identities-me
+    name: Cisco Meraki documentation for administered getAdministeredIdentitiesMe
+short_description: Information module for administered _identities _me
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all administered _identities _me
   cisco.meraki.administered_identities_me_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_entitlements_info.py b/plugins/modules/administered_licensing_subscription_entitlements_info.py
index 64b91eae9..6c7fc3d35 100644
--- a/plugins/modules/administered_licensing_subscription_entitlements_info.py
+++ b/plugins/modules/administered_licensing_subscription_entitlements_info.py
@@ -5,66 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_entitlements_info
-short_description: Information module for administered _licensing _subscription _entitlements
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all administered _licensing _subscription _entitlements.
-- Retrieve the list of purchasable entitlements.
-version_added: '2.18.0'
+  - Get all administered _licensing _subscription _entitlements.
+  - Retrieve the list of purchasable entitlements.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_entitlements_info
+notes:
+  - SDK Method used are licensing.Licensing.get_administered_licensing_subscription_entitlements,
+  - Paths used are get /administered/licensing/subscription/entitlements,
 options:
   headers:
     description: Additional headers.
     type: dict
   skus:
     description:
-    - Skus query parameter. Filter to entitlements with the specified SKUs.
+      - Skus query parameter. Filter to entitlements with the specified SKUs.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionEntitlements
-  description: Complete reference of the getAdministeredLicensingSubscriptionEntitlements API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-entitlements
-notes:
-  - SDK Method used are
-    licensing.Licensing.get_administered_licensing_subscription_entitlements,
-
-  - Paths used are
-    get /administered/licensing/subscription/entitlements,
+  - description: Complete reference of the getAdministeredLicensingSubscriptionEntitlements
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-entitlements
+    name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionEntitlements
+short_description: Information module for administered _licensing _subscription _entitlements
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Get all administered _licensing _subscription _entitlements
   cisco.meraki.administered_licensing_subscription_entitlements_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     skus: []
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_subscriptions_bind.py b/plugins/modules/administered_licensing_subscription_subscriptions_bind.py
index 7ab09dfcf..a65261ef7 100644
--- a/plugins/modules/administered_licensing_subscription_subscriptions_bind.py
+++ b/plugins/modules/administered_licensing_subscription_subscriptions_bind.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_subscriptions_bind
-short_description: Resource module for administered _licensing _subscription _subscriptions _bind
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource administered _licensing _subscription _subscriptions _bind.
-- Bind networks to a subscription.
-version_added: '2.18.0'
+  - Manage operation create of the resource administered _licensing _subscription
+    _subscriptions _bind.
+  - Bind networks to a subscription.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_subscriptions_bind
+notes:
+  - SDK Method used are licensing.Licensing.bind_administered_licensing_subscription_subscription,
+  - Paths used are post /administered/licensing/subscription/subscriptions/{subscriptionId}/bind,
 options:
   networkIds:
     description: List of network ids to bind to the subscription.
@@ -24,49 +25,46 @@
     description: SubscriptionId path parameter. Subscription ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing bindAdministeredLicensingSubscriptionSubscription
-  description: Complete reference of the bindAdministeredLicensingSubscriptionSubscription API.
-  link: https://developer.cisco.com/meraki/api-v1/#!bind-administered-licensing-subscription-subscription
-notes:
-  - SDK Method used are
-    licensing.Licensing.bind_administered_licensing_subscription_subscription,
-
-  - Paths used are
-    post /administered/licensing/subscription/subscriptions/{subscriptionId}/bind,
+  - description: Complete reference of the bindAdministeredLicensingSubscriptionSubscription
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!bind-administered-licensing-subscription-subscription
+    name: Cisco Meraki documentation for licensing bindAdministeredLicensingSubscriptionSubscription
+short_description: Resource module for administered _licensing _subscription _subscriptions
+  _bind
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.administered_licensing_subscription_subscriptions_bind:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds:
-    - L_1234
-    - N_5678
+      - L_1234
+      - N_5678
     subscriptionId: string
     validate: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_subscriptions_claim.py b/plugins/modules/administered_licensing_subscription_subscriptions_claim.py
index 2875a09a1..dd01cf2ce 100644
--- a/plugins/modules/administered_licensing_subscription_subscriptions_claim.py
+++ b/plugins/modules/administered_licensing_subscription_subscriptions_claim.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_subscriptions_claim
-short_description: Resource module for administered _licensing _subscription _subscriptions _claim
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource administered _licensing _subscription _subscriptions _claim.
-- Claim a subscription into an organization.
-version_added: '2.18.0'
+  - Manage operation create of the resource administered _licensing _subscription
+    _subscriptions _claim.
+  - Claim a subscription into an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_subscriptions_claim
+notes:
+  - SDK Method used are licensing.Licensing.claim_administered_licensing_subscription_subscriptions,
+  - Paths used are post /administered/licensing/subscription/subscriptions/claim,
 options:
   claimKey:
     description: The subscription's claim key.
@@ -29,49 +30,46 @@
     description: The id of the organization claiming the subscription.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing claimAdministeredLicensingSubscriptionSubscriptions
-  description: Complete reference of the claimAdministeredLicensingSubscriptionSubscriptions API.
-  link: https://developer.cisco.com/meraki/api-v1/#!claim-administered-licensing-subscription-subscriptions
-notes:
-  - SDK Method used are
-    licensing.Licensing.claim_administered_licensing_subscription_subscriptions,
-
-  - Paths used are
-    post /administered/licensing/subscription/subscriptions/claim,
+  - description: Complete reference of the claimAdministeredLicensingSubscriptionSubscriptions
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!claim-administered-licensing-subscription-subscriptions
+    name: Cisco Meraki documentation for licensing claimAdministeredLicensingSubscriptionSubscriptions
+short_description: Resource module for administered _licensing _subscription _subscriptions
+  _claim
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.administered_licensing_subscription_subscriptions_claim:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     claimKey: S2345-6789A-BCDEF-GHJKM
     description: Subscription for all main offices
     name: Corporate subscription
     organizationId: '12345678910'
     validate: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_subscriptions_claim_key_validate.py b/plugins/modules/administered_licensing_subscription_subscriptions_claim_key_validate.py
index 259da8b75..7714949bc 100644
--- a/plugins/modules/administered_licensing_subscription_subscriptions_claim_key_validate.py
+++ b/plugins/modules/administered_licensing_subscription_subscriptions_claim_key_validate.py
@@ -5,60 +5,58 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_subscriptions_claim_key_validate
-short_description: Resource module for administered _licensing _subscription _subscriptions _claim _key _validate
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource administered _licensing _subscription _subscriptions _claim _key _validate.
-- Find a subscription by claim key. Returns 400 if the key has already been claimed.
-version_added: '2.18.0'
+  - Manage operation create of the resource administered _licensing _subscription
+    _subscriptions _claim _key _validate.
+  - Find a subscription by claim key. Returns 400 if the key has already been claimed.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_subscriptions_claim_key_validate
+notes:
+  - SDK Method used are licensing.Licensing.validate_administered_licensing_subscription_subscriptions_claim_key,
+  - Paths used are post /administered/licensing/subscription/subscriptions/claimKey/validate,
 options:
   claimKey:
     description: The subscription's claim key.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing validateAdministeredLicensingSubscriptionSubscriptionsClaimKey
-  description: Complete reference of the validateAdministeredLicensingSubscriptionSubscriptionsClaimKey API.
-  link: https://developer.cisco.com/meraki/api-v1/#!validate-administered-licensing-subscription-subscriptions-claim-key
-notes:
-  - SDK Method used are
-    licensing.Licensing.validate_administered_licensing_subscription_subscriptions_claim_key,
-
-  - Paths used are
-    post /administered/licensing/subscription/subscriptions/claimKey/validate,
+  - description: Complete reference of the validateAdministeredLicensingSubscriptionSubscriptionsClaimKey
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!validate-administered-licensing-subscription-subscriptions-claim-key
+    name: Cisco Meraki documentation for licensing validateAdministeredLicensingSubscriptionSubscriptionsClaimKey
+short_description: Resource module for administered _licensing _subscription _subscriptions
+  _claim _key _validate
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.administered_licensing_subscription_subscriptions_claim_key_validate:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     claimKey: S2345-6789A-BCDEF-GHJKM
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_subscriptions_compliance_statuses_info.py b/plugins/modules/administered_licensing_subscription_subscriptions_compliance_statuses_info.py
index 08c0dfca8..b4dfddede 100644
--- a/plugins/modules/administered_licensing_subscription_subscriptions_compliance_statuses_info.py
+++ b/plugins/modules/administered_licensing_subscription_subscriptions_compliance_statuses_info.py
@@ -5,72 +5,70 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_subscriptions_compliance_statuses_info
-short_description: Information module for administered _licensing _subscription _subscriptions _compliance _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all administered _licensing _subscription _subscriptions _compliance _statuses.
-- Get compliance status for requested subscriptions.
-version_added: '2.18.0'
+  - Get all administered _licensing _subscription _subscriptions _compliance _statuses.
+  - Get compliance status for requested subscriptions.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_subscriptions_compliance_statuses_info
+notes:
+  - SDK Method used are licensing.Licensing.get_administered_licensing_subscription_subscriptions_compliance_statuses,
+  - Paths used are get /administered/licensing/subscription/subscriptions/compliance/statuses,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationIds:
     description:
-    - OrganizationIds query parameter. Organizations to get subscription compliance information for.
+      - OrganizationIds query parameter. Organizations to get subscription compliance
+        information for.
     elements: str
     type: list
   subscriptionIds:
     description:
-    - SubscriptionIds query parameter. Subscription ids.
+      - SubscriptionIds query parameter. Subscription ids.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionSubscriptionsComplianceStatuses
-  description: Complete reference of the getAdministeredLicensingSubscriptionSubscriptionsComplianceStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-subscriptions-compliance-statuses
-notes:
-  - SDK Method used are
-    licensing.Licensing.get_administered_licensing_subscription_subscriptions_compliance_statuses,
-
-  - Paths used are
-    get /administered/licensing/subscription/subscriptions/compliance/statuses,
+  - description: Complete reference of the getAdministeredLicensingSubscriptionSubscriptionsComplianceStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-subscriptions-compliance-statuses
+    name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionSubscriptionsComplianceStatuses
+short_description: Information module for administered _licensing _subscription _subscriptions
+  _compliance _statuses
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Get all administered _licensing _subscription _subscriptions _compliance _statuses
   cisco.meraki.administered_licensing_subscription_subscriptions_compliance_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationIds: []
     subscriptionIds: []
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/administered_licensing_subscription_subscriptions_info.py b/plugins/modules/administered_licensing_subscription_subscriptions_info.py
index 2641206c9..f831de63e 100644
--- a/plugins/modules/administered_licensing_subscription_subscriptions_info.py
+++ b/plugins/modules/administered_licensing_subscription_subscriptions_info.py
@@ -5,113 +5,124 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: administered_licensing_subscription_subscriptions_info
-short_description: Information module for administered _licensing _subscription _subscriptions
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all administered _licensing _subscription _subscriptions.
-- List available subscriptions.
-version_added: '2.18.0'
+  - Get all administered _licensing _subscription _subscriptions.
+  - List available subscriptions.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: administered_licensing_subscription_subscriptions_info
+notes:
+  - SDK Method used are licensing.Licensing.get_administered_licensing_subscription_subscriptions,
+  - Paths used are get /administered/licensing/subscription/subscriptions,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
+  endDate:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndDate query parameter. Filter subscriptions by end date, ISO 8601 format.
+        To filter with a range of dates, use ''endDate<option>=?'' in the request.
+        Accepted options include lt, gt, lte, gte.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  subscriptionIds:
+  headers:
+    description: Additional headers.
+    type: dict
+  name:
     description:
-    - SubscriptionIds query parameter. List of subscription ids to fetch.
-    elements: str
-    type: list
+      - Name query parameter. Search for subscription name.
+    type: str
   organizationIds:
     description:
-    - OrganizationIds query parameter. Organizations to get associated subscriptions for.
+      - OrganizationIds query parameter. Organizations to get associated subscriptions
+        for.
     elements: str
     type: list
-  statuses:
+  perPage:
     description:
-    - Statuses query parameter. List of statuses that returned subscriptions can have.
-    elements: str
-    type: list
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   productTypes:
     description:
-    - ProductTypes query parameter. List of product types that returned subscriptions need to have entitlements for.
+      - ProductTypes query parameter. List of product types that returned subscriptions
+        need to have entitlements for.
     elements: str
     type: list
-  name:
-    description:
-    - Name query parameter. Search for subscription name.
-    type: str
   startDate:
     description:
-    - >
-      StartDate query parameter. Filter subscriptions by start date, ISO 8601 format. To filter with a range of
-      dates, use 'startDate<option>=?' in the request. Accepted options include lt, gt, lte, gte.
+      - 'StartDate query parameter. Filter subscriptions by start date, ISO 8601 format.
+        To filter with a range of dates, use ''startDate<option>=?'' in the request.
+        Accepted options include lt, gt, lte, gte.
+
+        '
     type: str
-  endDate:
+  startingAfter:
     description:
-    - >
-      EndDate query parameter. Filter subscriptions by end date, ISO 8601 format. To filter with a range of dates,
-      use 'endDate<option>=?' in the request. Accepted options include lt, gt, lte, gte.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  statuses:
+    description:
+      - Statuses query parameter. List of statuses that returned subscriptions can
+        have.
+    elements: str
+    type: list
+  subscriptionIds:
+    description:
+      - SubscriptionIds query parameter. List of subscription ids to fetch.
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionSubscriptions
-  description: Complete reference of the getAdministeredLicensingSubscriptionSubscriptions API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-subscriptions
-notes:
-  - SDK Method used are
-    licensing.Licensing.get_administered_licensing_subscription_subscriptions,
-
-  - Paths used are
-    get /administered/licensing/subscription/subscriptions,
+  - description: Complete reference of the getAdministeredLicensingSubscriptionSubscriptions
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-subscriptions
+    name: Cisco Meraki documentation for licensing getAdministeredLicensingSubscriptionSubscriptions
+short_description: Information module for administered _licensing _subscription _subscriptions
+version_added: 2.18.0
 """
 
 EXAMPLES = r"""
 - name: Get all administered _licensing _subscription _subscriptions
   cisco.meraki.administered_licensing_subscription_subscriptions_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -125,7 +136,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices.py b/plugins/modules/devices.py
index 367be0e79..794925dd4 100644
--- a/plugins/modules/devices.py
+++ b/plugins/modules/devices.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices
-short_description: Resource module for devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices.
-- Update the attributes of a device.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices.
+  - Update the attributes of a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices
+notes:
+  - SDK Method used are devices.Devices.update_device,
+  - Paths used are put /devices/{serial},
 options:
   address:
     description: The address of a device.
@@ -43,54 +43,50 @@
     description: Serial path parameter.
     type: str
   switchProfileId:
-    description: The ID of a switch template to bind to the device (for available switch
-      templates, see the 'Switch Templates' endpoint). Use null to unbind the switch
-      device from the current profile. For a device to be bindable to a switch template,
-      it must (1) be a switch, and (2) belong to a network that is bound to a configuration
-      template.
+    description: The ID of a switch template to bind to the device (for available
+      switch templates, see the 'Switch Templates' endpoint). Use null to unbind the
+      switch device from the current profile. For a device to be bindable to a switch
+      template, it must (1) be a switch, and (2) belong to a network that is bound
+      to a configuration template.
     type: str
   tags:
     description: The list of tags of a device.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices updateDevice
-  description: Complete reference of the updateDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device
-notes:
-  - SDK Method used are
-    devices.Devices.update_device,
-
-  - Paths used are
-    put /devices/{serial},
+  - description: Complete reference of the updateDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device
+    name: Cisco Meraki documentation for devices updateDevice
+short_description: Resource module for devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.devices:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     address: 1600 Pennsylvania Ave
     floorPlanId: g_2176982374
@@ -102,8 +98,7 @@
     serial: string
     switchProfileId: '1234'
     tags:
-    - ' recently-added '
-
+      - ' recently-added '
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_performance_info.py b/plugins/modules/devices_appliance_performance_info.py
index 779df6b62..f1622c655 100644
--- a/plugins/modules/devices_appliance_performance_info.py
+++ b/plugins/modules/devices_appliance_performance_info.py
@@ -5,85 +5,85 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_performance_info
-short_description: Information module for devices _appliance _performance
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _appliance _performance.
-- >
-   Return the performance score for a single MX. Only primary MX devices supported. If no data is available, a 204
-   error code is returned.
-version_added: '2.16.0'
+  - Get all devices _appliance _performance.
+  - 'Return the performance score for a single MX. Only primary MX devices supported.
+    If no data is available, a 204 error code is returned.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_performance_info
+notes:
+  - SDK Method used are appliance.Appliance.get_device_appliance_performance,
+  - Paths used are get /devices/{serial}/appliance/performance,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 30 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 30 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 14 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 14 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 30 minutes
-      and be less than or equal to 14 days. The default is 30 minutes.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 30 minutes and be
+        less than or equal to 14 days. The default is 30 minutes.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getDeviceAppliancePerformance
-  description: Complete reference of the getDeviceAppliancePerformance API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-performance
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_device_appliance_performance,
-
-  - Paths used are
-    get /devices/{serial}/appliance/performance,
+  - description: Complete reference of the getDeviceAppliancePerformance API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-performance
+    name: Cisco Meraki documentation for appliance getDeviceAppliancePerformance
+short_description: Information module for devices _appliance _performance
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _appliance _performance
   cisco.meraki.devices_appliance_performance_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_radio_settings.py b/plugins/modules/devices_appliance_radio_settings.py
index c2dd04673..dcb4c8244 100644
--- a/plugins/modules/devices_appliance_radio_settings.py
+++ b/plugins/modules/devices_appliance_radio_settings.py
@@ -5,25 +5,25 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_radio_settings
-short_description: Resource module for devices _appliance _radio _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _appliance _radio _settings.
-- Update the radio settings of an appliance.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _appliance _radio _settings.
+  - Update the radio settings of an appliance.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_radio_settings
+notes:
+  - SDK Method used are appliance.Appliance.update_device_appliance_radio_settings,
+  - Paths used are put /devices/{serial}/appliance/radio/settings,
 options:
   fiveGhzSettings:
     description: Manual radio settings for 5 GHz.
     suboptions:
       channel:
         description: Sets a manual channel for 5 GHz. Can be '36', '40', '44', '48',
-          '52', '56', '60', '64', '100', '104', '108', '112', '116', '120', '124', '128',
-          '132', '136', '140', '144', '149', '153', '157', '161', '165', '169', '173'
-          or '177' or null for using auto channel.
+          '52', '56', '60', '64', '100', '104', '108', '112', '116', '120', '124',
+          '128', '132', '136', '140', '144', '149', '153', '157', '161', '165', '169',
+          '173' or '177' or null for using auto channel.
         type: int
       channelWidth:
         description: Sets a manual channel width for 5 GHz. Can be '0', '20', '40',
@@ -35,10 +35,10 @@
         type: int
     type: dict
   rfProfileId:
-    description: The ID of an RF profile to assign to the device. If the value of this
-      parameter is null, the appropriate basic RF profile (indoor or outdoor) will be
-      assigned to the device. Assigning an RF profile will clear ALL manually configured
-      overrides on the device (channel width, channel, power).
+    description: The ID of an RF profile to assign to the device. If the value of
+      this parameter is null, the appropriate basic RF profile (indoor or outdoor)
+      will be assigned to the device. Assigning an RF profile will clear ALL manually
+      configured overrides on the device (channel width, channel, power).
     type: str
   serial:
     description: Serial path parameter.
@@ -47,9 +47,9 @@
     description: Manual radio settings for 2.4 GHz.
     suboptions:
       channel:
-        description: Sets a manual channel for 2.4 GHz. Can be '1', '2', '3', '4', '5',
-          '6', '7', '8', '9', '10', '11', '12', '13' or '14' or null for using auto
-          channel.
+        description: Sets a manual channel for 2.4 GHz. Can be '1', '2', '3', '4',
+          '5', '6', '7', '8', '9', '10', '11', '12', '13' or '14' or null for using
+          auto channel.
         type: int
       targetPower:
         description: Set a manual target power for 2.4 GHz (dBm). Enter null for using
@@ -57,43 +57,39 @@
         type: int
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateDeviceApplianceRadioSettings
-  description: Complete reference of the updateDeviceApplianceRadioSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-appliance-radio-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_device_appliance_radio_settings,
-
-  - Paths used are
-    put /devices/{serial}/appliance/radio/settings,
+  - description: Complete reference of the updateDeviceApplianceRadioSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-appliance-radio-settings
+    name: Cisco Meraki documentation for appliance updateDeviceApplianceRadioSettings
+short_description: Resource module for devices _appliance _radio _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_appliance_radio_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     fiveGhzSettings:
       channel: 149
@@ -104,7 +100,6 @@
     twoFourGhzSettings:
       channel: 11
       targetPower: 21
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_radio_settings_info.py b/plugins/modules/devices_appliance_radio_settings_info.py
index f883e31ba..102b5445f 100644
--- a/plugins/modules/devices_appliance_radio_settings_info.py
+++ b/plugins/modules/devices_appliance_radio_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_radio_settings_info
-short_description: Information module for devices _appliance _radio _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _appliance _radio _settings.
-- Return the radio settings of an appliance.
-version_added: '2.16.0'
+  - Get all devices _appliance _radio _settings.
+  - Return the radio settings of an appliance.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_radio_settings_info
+notes:
+  - SDK Method used are appliance.Appliance.get_device_appliance_radio_settings,
+  - Paths used are get /devices/{serial}/appliance/radio/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getDeviceApplianceRadioSettings
-  description: Complete reference of the getDeviceApplianceRadioSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-radio-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_device_appliance_radio_settings,
-
-  - Paths used are
-    get /devices/{serial}/appliance/radio/settings,
+  - description: Complete reference of the getDeviceApplianceRadioSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-radio-settings
+    name: Cisco Meraki documentation for appliance getDeviceApplianceRadioSettings
+short_description: Information module for devices _appliance _radio _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _appliance _radio _settings
   cisco.meraki.devices_appliance_radio_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_uplinks_settings.py b/plugins/modules/devices_appliance_uplinks_settings.py
index 1b24e9dfb..508679f18 100644
--- a/plugins/modules/devices_appliance_uplinks_settings.py
+++ b/plugins/modules/devices_appliance_uplinks_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_uplinks_settings
-short_description: Resource module for devices _appliance _uplinks _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _appliance _uplinks _settings.
-- Update the uplink settings for an MX appliance.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _appliance _uplinks _settings.
+  - Update the uplink settings for an MX appliance.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_uplinks_settings
+notes:
+  - SDK Method used are appliance.Appliance.update_device_appliance_uplinks_settings,
+  - Paths used are put /devices/{serial}/appliance/uplinks/settings,
 options:
   interfaces:
     description: Interface settings.
@@ -35,8 +35,8 @@
                     description: Whether PPPoE authentication is enabled.
                     type: bool
                   password:
-                    description: Password for PPPoE authentication. This parameter is
-                      not returned.
+                    description: Password for PPPoE authentication. This parameter
+                      is not returned.
                     type: str
                   username:
                     description: Username for PPPoE authentication.
@@ -66,8 +66,8 @@
                     description: The nameserver settings for this SVI.
                     suboptions:
                       addresses:
-                        description: Up to 2 nameserver addresses to use, ordered in
-                          priority from highest to lowest priority.
+                        description: Up to 2 nameserver addresses to use, ordered
+                          in priority from highest to lowest priority.
                         elements: str
                         type: list
                     type: dict
@@ -91,8 +91,8 @@
                     description: The nameserver settings for this SVI.
                     suboptions:
                       addresses:
-                        description: Up to 2 nameserver addresses to use, ordered in
-                          priority from highest to lowest priority.
+                        description: Up to 2 nameserver addresses to use, ordered
+                          in priority from highest to lowest priority.
                         elements: str
                         type: list
                     type: dict
@@ -125,8 +125,8 @@
                     description: Whether PPPoE authentication is enabled.
                     type: bool
                   password:
-                    description: Password for PPPoE authentication. This parameter is
-                      not returned.
+                    description: Password for PPPoE authentication. This parameter
+                      is not returned.
                     type: str
                   username:
                     description: Username for PPPoE authentication.
@@ -156,8 +156,8 @@
                     description: The nameserver settings for this SVI.
                     suboptions:
                       addresses:
-                        description: Up to 2 nameserver addresses to use, ordered in
-                          priority from highest to lowest priority.
+                        description: Up to 2 nameserver addresses to use, ordered
+                          in priority from highest to lowest priority.
                         elements: str
                         type: list
                     type: dict
@@ -181,8 +181,8 @@
                     description: The nameserver settings for this SVI.
                     suboptions:
                       addresses:
-                        description: Up to 2 nameserver addresses to use, ordered in
-                          priority from highest to lowest priority.
+                        description: Up to 2 nameserver addresses to use, ordered
+                          in priority from highest to lowest priority.
                         elements: str
                         type: list
                     type: dict
@@ -204,43 +204,39 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateDeviceApplianceUplinksSettings
-  description: Complete reference of the updateDeviceApplianceUplinksSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-appliance-uplinks-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_device_appliance_uplinks_settings,
-
-  - Paths used are
-    put /devices/{serial}/appliance/uplinks/settings,
+  - description: Complete reference of the updateDeviceApplianceUplinksSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-appliance-uplinks-settings
+    name: Cisco Meraki documentation for appliance updateDeviceApplianceUplinksSettings
+short_description: Resource module for devices _appliance _uplinks _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_appliance_uplinks_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     interfaces:
       wan1:
@@ -258,15 +254,15 @@
             gateway: 13.14.15.16
             nameservers:
               addresses:
-              - 1.2.3.4
+                - 1.2.3.4
           ipv6:
             address: 1:2:3::4
             assignmentMode: static
             gateway: 1:2:3::5
             nameservers:
               addresses:
-              - 1001:4860:4860::8888
-              - 1001:4860:4860::8844
+                - 1001:4860:4860::8888
+                - 1001:4860:4860::8844
         vlanTagging:
           enabled: true
           vlanId: 1
@@ -285,20 +281,19 @@
             gateway: 13.14.15.16
             nameservers:
               addresses:
-              - 1.2.3.4
+                - 1.2.3.4
           ipv6:
             address: 1:2:3::4
             assignmentMode: static
             gateway: 1:2:3::5
             nameservers:
               addresses:
-              - 1001:4860:4860::8888
-              - 1001:4860:4860::8844
+                - 1001:4860:4860::8888
+                - 1001:4860:4860::8844
         vlanTagging:
           enabled: true
           vlanId: 1
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_uplinks_settings_info.py b/plugins/modules/devices_appliance_uplinks_settings_info.py
index 84ae86bfe..a0d29050e 100644
--- a/plugins/modules/devices_appliance_uplinks_settings_info.py
+++ b/plugins/modules/devices_appliance_uplinks_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_uplinks_settings_info
-short_description: Information module for devices _appliance _uplinks _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _appliance _uplinks _settings.
-- Return the uplink settings for an MX appliance.
-version_added: '2.16.0'
+  - Get all devices _appliance _uplinks _settings.
+  - Return the uplink settings for an MX appliance.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_uplinks_settings_info
+notes:
+  - SDK Method used are appliance.Appliance.get_device_appliance_uplinks_settings,
+  - Paths used are get /devices/{serial}/appliance/uplinks/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getDeviceApplianceUplinksSettings
-  description: Complete reference of the getDeviceApplianceUplinksSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-uplinks-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_device_appliance_uplinks_settings,
-
-  - Paths used are
-    get /devices/{serial}/appliance/uplinks/settings,
+  - description: Complete reference of the getDeviceApplianceUplinksSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-appliance-uplinks-settings
+    name: Cisco Meraki documentation for appliance getDeviceApplianceUplinksSettings
+short_description: Information module for devices _appliance _uplinks _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _appliance _uplinks _settings
   cisco.meraki.devices_appliance_uplinks_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_appliance_vmx_authentication_token.py b/plugins/modules/devices_appliance_vmx_authentication_token.py
index b6f01ca9e..45142793c 100644
--- a/plugins/modules/devices_appliance_vmx_authentication_token.py
+++ b/plugins/modules/devices_appliance_vmx_authentication_token.py
@@ -5,60 +5,57 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_appliance_vmx_authentication_token
-short_description: Resource module for devices _appliance _vmx _authentication _token
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _appliance _vmx _authentication _token.
-- Generate a new vMX authentication token.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _appliance _vmx _authentication
+    _token.
+  - Generate a new vMX authentication token.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_appliance_vmx_authentication_token
+notes:
+  - SDK Method used are appliance.Appliance.create_device_appliance_vmx_authentication_token,
+  - Paths used are post /devices/{serial}/appliance/vmx/authenticationToken,
 options:
   serial:
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance createDeviceApplianceVmxAuthenticationToken
-  description: Complete reference of the createDeviceApplianceVmxAuthenticationToken API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-appliance-vmx-authentication-token
-notes:
-  - SDK Method used are
-    appliance.Appliance.create_device_appliance_vmx_authentication_token,
-
-  - Paths used are
-    post /devices/{serial}/appliance/vmx/authenticationToken,
+  - description: Complete reference of the createDeviceApplianceVmxAuthenticationToken
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-appliance-vmx-authentication-token
+    name: Cisco Meraki documentation for appliance createDeviceApplianceVmxAuthenticationToken
+short_description: Resource module for devices _appliance _vmx _authentication _token
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_appliance_vmx_authentication_token:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_blink_leds.py b/plugins/modules/devices_blink_leds.py
index a9c7d9284..b52ed8cb1 100644
--- a/plugins/modules/devices_blink_leds.py
+++ b/plugins/modules/devices_blink_leds.py
@@ -5,74 +5,70 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_blink_leds
-short_description: Resource module for devices _blink _leds
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _blink _leds.
-- Blink the LEDs on a device. This endpoint is deprecrated in favor of /devices/{serial}/liveTools/leds/blink.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _blink _leds.
+  - Blink the LEDs on a device. This endpoint is deprecrated in favor of /devices/{serial}/liveTools/leds/blink.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_blink_leds
+notes:
+  - SDK Method used are devices.Devices.blink_device_leds,
+  - Paths used are post /devices/{serial}/blinkLeds,
 options:
   duration:
-    description: The duration in seconds. Must be between 5 and 120. Default is 20 seconds.
+    description: The duration in seconds. Must be between 5 and 120. Default is 20
+      seconds.
     type: int
   duty:
-    description: The duty cycle as the percent active. Must be between 10 and 90. Default
-      is 50.
+    description: The duty cycle as the percent active. Must be between 10 and 90.
+      Default is 50.
     type: int
   period:
-    description: The period in milliseconds. Must be between 100 and 1000. Default is
-      160 milliseconds.
+    description: The period in milliseconds. Must be between 100 and 1000. Default
+      is 160 milliseconds.
     type: int
   serial:
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices blinkDeviceLeds
-  description: Complete reference of the blinkDeviceLeds API.
-  link: https://developer.cisco.com/meraki/api-v1/#!blink-device-leds
-notes:
-  - SDK Method used are
-    devices.Devices.blink_device_leds,
-
-  - Paths used are
-    post /devices/{serial}/blinkLeds,
+  - description: Complete reference of the blinkDeviceLeds API.
+    link: https://developer.cisco.com/meraki/api-v1/#!blink-device-leds
+    name: Cisco Meraki documentation for devices blinkDeviceLeds
+short_description: Resource module for devices _blink _leds
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_blink_leds:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     duration: 20
     duty: 50
     period: 160
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_analytics_live_info.py b/plugins/modules/devices_camera_analytics_live_info.py
index c1900d086..31a427775 100644
--- a/plugins/modules/devices_camera_analytics_live_info.py
+++ b/plugins/modules/devices_camera_analytics_live_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_analytics_live_info
-short_description: Information module for devices _camera _analytics _live
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _analytics _live.
-- Returns live state from camera analytics zones.
-version_added: '2.16.0'
+  - Get all devices _camera _analytics _live.
+  - Returns live state from camera analytics zones.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_analytics_live_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_analytics_live,
+  - Paths used are get /devices/{serial}/camera/analytics/live,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraAnalyticsLive
-  description: Complete reference of the getDeviceCameraAnalyticsLive API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-analytics-live
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_analytics_live,
-
-  - Paths used are
-    get /devices/{serial}/camera/analytics/live,
+  - description: Complete reference of the getDeviceCameraAnalyticsLive API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-analytics-live
+    name: Cisco Meraki documentation for camera getDeviceCameraAnalyticsLive
+short_description: Information module for devices _camera _analytics _live
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _analytics _live
   cisco.meraki.devices_camera_analytics_live_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_custom_analytics.py b/plugins/modules/devices_camera_custom_analytics.py
index a120bc144..3a3fee53b 100644
--- a/plugins/modules/devices_camera_custom_analytics.py
+++ b/plugins/modules/devices_camera_custom_analytics.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_custom_analytics
-short_description: Resource module for devices _camera _custom _analytics
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _camera _custom _analytics.
-- Update custom analytics settings for a camera.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _camera _custom _analytics.
+  - Update custom analytics settings for a camera.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_custom_analytics
+notes:
+  - SDK Method used are camera.Camera.update_device_camera_custom_analytics,
+  - Paths used are put /devices/{serial}/camera/customAnalytics,
 options:
   artifactId:
     description: The ID of the custom analytics artifact.
@@ -37,51 +37,46 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera updateDeviceCameraCustomAnalytics
-  description: Complete reference of the updateDeviceCameraCustomAnalytics API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-custom-analytics
-notes:
-  - SDK Method used are
-    camera.Camera.update_device_camera_custom_analytics,
-
-  - Paths used are
-    put /devices/{serial}/camera/customAnalytics,
+  - description: Complete reference of the updateDeviceCameraCustomAnalytics API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-custom-analytics
+    name: Cisco Meraki documentation for camera updateDeviceCameraCustomAnalytics
+short_description: Resource module for devices _camera _custom _analytics
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_camera_custom_analytics:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     artifactId: '1'
     enabled: true
     parameters:
-    - name: detection_threshold
-      value: '0.5'
+      - name: detection_threshold
+        value: '0.5'
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_custom_analytics_info.py b/plugins/modules/devices_camera_custom_analytics_info.py
index cf1224836..821b33e1b 100644
--- a/plugins/modules/devices_camera_custom_analytics_info.py
+++ b/plugins/modules/devices_camera_custom_analytics_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_custom_analytics_info
-short_description: Information module for devices _camera _custom _analytics
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _custom _analytics.
-- Return custom analytics settings for a camera.
-version_added: '2.16.0'
+  - Get all devices _camera _custom _analytics.
+  - Return custom analytics settings for a camera.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_custom_analytics_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_custom_analytics,
+  - Paths used are get /devices/{serial}/camera/customAnalytics,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraCustomAnalytics
-  description: Complete reference of the getDeviceCameraCustomAnalytics API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-custom-analytics
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_custom_analytics,
-
-  - Paths used are
-    get /devices/{serial}/camera/customAnalytics,
+  - description: Complete reference of the getDeviceCameraCustomAnalytics API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-custom-analytics
+    name: Cisco Meraki documentation for camera getDeviceCameraCustomAnalytics
+short_description: Information module for devices _camera _custom _analytics
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _custom _analytics
   cisco.meraki.devices_camera_custom_analytics_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_generate_snapshot.py b/plugins/modules/devices_camera_generate_snapshot.py
index 8d123d4c2..784761b0f 100644
--- a/plugins/modules/devices_camera_generate_snapshot.py
+++ b/plugins/modules/devices_camera_generate_snapshot.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_generate_snapshot
-short_description: Resource module for devices _camera _generate _snapshot
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _camera _generate _snapshot.
-- Generate a snapshot of what the camera sees at the specified time and return a link to that image.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _camera _generate _snapshot.
+  - Generate a snapshot of what the camera sees at the specified time and return a
+    link to that image.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_generate_snapshot
+notes:
+  - SDK Method used are camera.Camera.generate_device_camera_snapshot,
+  - Paths used are post /devices/{serial}/camera/generateSnapshot,
 options:
   fullframe:
     description: Optional If set to "true" the snapshot will be taken at full sensor
@@ -24,52 +25,47 @@
     description: Serial path parameter.
     type: str
   timestamp:
-    description: Optional The snapshot will be taken from this time on the camera. The
-      timestamp is expected to be in ISO 8601 format. If no timestamp is specified,
+    description: Optional The snapshot will be taken from this time on the camera.
+      The timestamp is expected to be in ISO 8601 format. If no timestamp is specified,
       we will assume current time.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera generateDeviceCameraSnapshot
-  description: Complete reference of the generateDeviceCameraSnapshot API.
-  link: https://developer.cisco.com/meraki/api-v1/#!generate-device-camera-snapshot
-notes:
-  - SDK Method used are
-    camera.Camera.generate_device_camera_snapshot,
-
-  - Paths used are
-    post /devices/{serial}/camera/generateSnapshot,
+  - description: Complete reference of the generateDeviceCameraSnapshot API.
+    link: https://developer.cisco.com/meraki/api-v1/#!generate-device-camera-snapshot
+    name: Cisco Meraki documentation for camera generateDeviceCameraSnapshot
+short_description: Resource module for devices _camera _generate _snapshot
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_camera_generate_snapshot:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     fullframe: false
     serial: string
     timestamp: '2021-04-30T15:18:08Z'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_quality_and_retention.py b/plugins/modules/devices_camera_quality_and_retention.py
index 80addc4a5..6935f221f 100644
--- a/plugins/modules/devices_camera_quality_and_retention.py
+++ b/plugins/modules/devices_camera_quality_and_retention.py
@@ -5,24 +5,24 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_quality_and_retention
-short_description: Resource module for devices _camera _quality _and _retention
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _camera _quality _and _retention.
-- Update quality and retention settings for the given camera.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _camera _quality _and _retention.
+  - Update quality and retention settings for the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_quality_and_retention
+notes:
+  - SDK Method used are camera.Camera.update_device_camera_quality_and_retention,
+  - Paths used are put /devices/{serial}/camera/qualityAndRetention,
 options:
   audioRecordingEnabled:
     description: Boolean indicating if audio recording is enabled(true) or disabled(false)
       on the camera.
     type: bool
   motionBasedRetentionEnabled:
-    description: Boolean indicating if motion-based retention is enabled(true) or disabled(false)
-      on the camera.
+    description: Boolean indicating if motion-based retention is enabled(true) or
+      disabled(false) on the camera.
     type: bool
   motionDetectorVersion:
     description: The version of the motion detector that will be used by the camera.
@@ -31,17 +31,17 @@
   profileId:
     description: The ID of a quality and retention profile to assign to the camera.
       The profile's settings will override all of the per-camera quality and retention
-      settings. If the value of this parameter is null, any existing profile will be
-      unassigned from the camera.
+      settings. If the value of this parameter is null, any existing profile will
+      be unassigned from the camera.
     type: str
   quality:
     description: Quality of the camera. Can be one of 'Standard', 'High' or 'Enhanced'.
       Not all qualities are supported by every camera model.
     type: str
   resolution:
-    description: Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080',
-      '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported
-      by every camera model.
+    description: Resolution of the camera. Can be one of '1280x720', '1920x1080',
+      '1080x1080', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions
+      are supported by every camera model.
     type: str
   restrictedBandwidthModeEnabled:
     description: Boolean indicating if restricted bandwidth is enabled(true) or disabled(false)
@@ -51,43 +51,39 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera updateDeviceCameraQualityAndRetention
-  description: Complete reference of the updateDeviceCameraQualityAndRetention API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-quality-and-retention
-notes:
-  - SDK Method used are
-    camera.Camera.update_device_camera_quality_and_retention,
-
-  - Paths used are
-    put /devices/{serial}/camera/qualityAndRetention,
+  - description: Complete reference of the updateDeviceCameraQualityAndRetention API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-quality-and-retention
+    name: Cisco Meraki documentation for camera updateDeviceCameraQualityAndRetention
+short_description: Resource module for devices _camera _quality _and _retention
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_camera_quality_and_retention:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     audioRecordingEnabled: false
     motionBasedRetentionEnabled: false
@@ -97,7 +93,6 @@
     resolution: 1280x720
     restrictedBandwidthModeEnabled: false
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_quality_and_retention_info.py b/plugins/modules/devices_camera_quality_and_retention_info.py
index 5d5877940..7c2784c4d 100644
--- a/plugins/modules/devices_camera_quality_and_retention_info.py
+++ b/plugins/modules/devices_camera_quality_and_retention_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_quality_and_retention_info
-short_description: Information module for devices _camera _quality _and _retention
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _quality _and _retention.
-- Returns quality and retention settings for the given camera.
-version_added: '2.16.0'
+  - Get all devices _camera _quality _and _retention.
+  - Returns quality and retention settings for the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_quality_and_retention_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_quality_and_retention,
+  - Paths used are get /devices/{serial}/camera/qualityAndRetention,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraQualityAndRetention
-  description: Complete reference of the getDeviceCameraQualityAndRetention API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-quality-and-retention
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_quality_and_retention,
-
-  - Paths used are
-    get /devices/{serial}/camera/qualityAndRetention,
+  - description: Complete reference of the getDeviceCameraQualityAndRetention API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-quality-and-retention
+    name: Cisco Meraki documentation for camera getDeviceCameraQualityAndRetention
+short_description: Information module for devices _camera _quality _and _retention
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _quality _and _retention
   cisco.meraki.devices_camera_quality_and_retention_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_sense.py b/plugins/modules/devices_camera_sense.py
index cb65eb3c4..8ddde06eb 100644
--- a/plugins/modules/devices_camera_sense.py
+++ b/plugins/modules/devices_camera_sense.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_sense
-short_description: Resource module for devices _camera _sense
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _camera _sense.
-- Update sense settings for the given camera.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _camera _sense.
+  - Update sense settings for the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_sense
+notes:
+  - SDK Method used are camera.Camera.update_device_camera_sense,
+  - Paths used are put /devices/{serial}/camera/sense,
 options:
   audioDetection:
     description: The details of the audio detection config.
@@ -28,8 +28,8 @@
     description: The ID of the object detection model.
     type: str
   mqttBrokerId:
-    description: The ID of the MQTT broker to be enabled on the camera. A value of null
-      will disable MQTT on the camera.
+    description: The ID of the MQTT broker to be enabled on the camera. A value of
+      null will disable MQTT on the camera.
     type: str
   senseEnabled:
     description: Boolean indicating if sense(license) is enabled(true) or disabled(false)
@@ -39,50 +39,45 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera updateDeviceCameraSense
-  description: Complete reference of the updateDeviceCameraSense API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-sense
-notes:
-  - SDK Method used are
-    camera.Camera.update_device_camera_sense,
-
-  - Paths used are
-    put /devices/{serial}/camera/sense,
+  - description: Complete reference of the updateDeviceCameraSense API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-sense
+    name: Cisco Meraki documentation for camera updateDeviceCameraSense
+short_description: Resource module for devices _camera _sense
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_camera_sense:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     audioDetection:
       enabled: false
     mqttBrokerId: '1234'
     senseEnabled: true
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_sense_info.py b/plugins/modules/devices_camera_sense_info.py
index 319939da0..535c5dd9e 100644
--- a/plugins/modules/devices_camera_sense_info.py
+++ b/plugins/modules/devices_camera_sense_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_sense_info
-short_description: Information module for devices _camera _sense
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _sense.
-- Returns sense settings for a given camera.
-version_added: '2.16.0'
+  - Get all devices _camera _sense.
+  - Returns sense settings for a given camera.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_sense_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_sense,
+  - Paths used are get /devices/{serial}/camera/sense,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraSense
-  description: Complete reference of the getDeviceCameraSense API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-sense
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_sense,
-
-  - Paths used are
-    get /devices/{serial}/camera/sense,
+  - description: Complete reference of the getDeviceCameraSense API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-sense
+    name: Cisco Meraki documentation for camera getDeviceCameraSense
+short_description: Information module for devices _camera _sense
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _sense
   cisco.meraki.devices_camera_sense_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_video_link_info.py b/plugins/modules/devices_camera_video_link_info.py
index 598348c2f..5bb0d8a1b 100644
--- a/plugins/modules/devices_camera_video_link_info.py
+++ b/plugins/modules/devices_camera_video_link_info.py
@@ -5,72 +5,70 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_video_link_info
-short_description: Information module for devices _camera _video _link
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _video _link.
-- Returns video link to the specified camera. If a timestamp is supplied, it links to that timestamp.
-version_added: '2.16.0'
+  - Get all devices _camera _video _link.
+  - Returns video link to the specified camera. If a timestamp is supplied, it links
+    to that timestamp.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_video_link_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_video_link,
+  - Paths used are get /devices/{serial}/camera/videoLink,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
   timestamp:
     description:
-    - >
-      Timestamp query parameter. Optional The video link will start at this time. The timestamp should be a string
-      in ISO8601 format. If no timestamp is specified, we will assume current time.
+      - 'Timestamp query parameter. Optional The video link will start at this time.
+        The timestamp should be a string in ISO8601 format. If no timestamp is specified,
+        we will assume current time.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraVideoLink
-  description: Complete reference of the getDeviceCameraVideoLink API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-video-link
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_video_link,
-
-  - Paths used are
-    get /devices/{serial}/camera/videoLink,
+  - description: Complete reference of the getDeviceCameraVideoLink API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-video-link
+    name: Cisco Meraki documentation for camera getDeviceCameraVideoLink
+short_description: Information module for devices _camera _video _link
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _video _link
   cisco.meraki.devices_camera_video_link_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     timestamp: string
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_video_settings.py b/plugins/modules/devices_camera_video_settings.py
index 24a5896f3..a98ce58a4 100644
--- a/plugins/modules/devices_camera_video_settings.py
+++ b/plugins/modules/devices_camera_video_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_video_settings
-short_description: Resource module for devices _camera _video _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _camera _video _settings.
-- Update video settings for the given camera.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _camera _video _settings.
+  - Update video settings for the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_video_settings
+notes:
+  - SDK Method used are camera.Camera.update_device_camera_video_settings,
+  - Paths used are put /devices/{serial}/camera/video/settings,
 options:
   externalRtspEnabled:
     description: Boolean indicating if external rtsp stream is exposed.
@@ -23,47 +23,42 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera updateDeviceCameraVideoSettings
-  description: Complete reference of the updateDeviceCameraVideoSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-video-settings
-notes:
-  - SDK Method used are
-    camera.Camera.update_device_camera_video_settings,
-
-  - Paths used are
-    put /devices/{serial}/camera/video/settings,
+  - description: Complete reference of the updateDeviceCameraVideoSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-video-settings
+    name: Cisco Meraki documentation for camera updateDeviceCameraVideoSettings
+short_description: Resource module for devices _camera _video _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_camera_video_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     externalRtspEnabled: true
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_video_settings_info.py b/plugins/modules/devices_camera_video_settings_info.py
index 0610c46fe..f0c958598 100644
--- a/plugins/modules/devices_camera_video_settings_info.py
+++ b/plugins/modules/devices_camera_video_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_video_settings_info
-short_description: Information module for devices _camera _video _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _video _settings.
-- Returns video settings for the given camera.
-version_added: '2.16.0'
+  - Get all devices _camera _video _settings.
+  - Returns video settings for the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_video_settings_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_video_settings,
+  - Paths used are get /devices/{serial}/camera/video/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraVideoSettings
-  description: Complete reference of the getDeviceCameraVideoSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-video-settings
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_video_settings,
-
-  - Paths used are
-    get /devices/{serial}/camera/video/settings,
+  - description: Complete reference of the getDeviceCameraVideoSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-video-settings
+    name: Cisco Meraki documentation for camera getDeviceCameraVideoSettings
+short_description: Information module for devices _camera _video _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _video _settings
   cisco.meraki.devices_camera_video_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_wireless_profiles.py b/plugins/modules/devices_camera_wireless_profiles.py
index 8b5bf09e2..78258df14 100644
--- a/plugins/modules/devices_camera_wireless_profiles.py
+++ b/plugins/modules/devices_camera_wireless_profiles.py
@@ -5,18 +5,19 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_wireless_profiles
-short_description: Resource module for devices _camera _wireless _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _camera _wireless _profiles.
-- >
-   Assign wireless profiles to the given camera. Incremental updates are not supported, all profile assignment need
-   to be supplied at once.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _camera _wireless _profiles.
+  - 'Assign wireless profiles to the given camera. Incremental updates are not supported,
+    all profile assignment need to be supplied at once.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_wireless_profiles
+notes:
+  - SDK Method used are camera.Camera.update_device_camera_wireless_profiles,
+  - Paths used are put /devices/{serial}/camera/wirelessProfiles,
 options:
   ids:
     description: The ids of the wireless profile to assign to the given camera.
@@ -35,50 +36,45 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera updateDeviceCameraWirelessProfiles
-  description: Complete reference of the updateDeviceCameraWirelessProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-wireless-profiles
-notes:
-  - SDK Method used are
-    camera.Camera.update_device_camera_wireless_profiles,
-
-  - Paths used are
-    put /devices/{serial}/camera/wirelessProfiles,
+  - description: Complete reference of the updateDeviceCameraWirelessProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-camera-wireless-profiles
+    name: Cisco Meraki documentation for camera updateDeviceCameraWirelessProfiles
+short_description: Resource module for devices _camera _wireless _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_camera_wireless_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     ids:
       backup: '1'
       primary: '3'
       secondary: '2'
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_camera_wireless_profiles_info.py b/plugins/modules/devices_camera_wireless_profiles_info.py
index cf30f9658..a66f44b47 100644
--- a/plugins/modules/devices_camera_wireless_profiles_info.py
+++ b/plugins/modules/devices_camera_wireless_profiles_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_camera_wireless_profiles_info
-short_description: Information module for devices _camera _wireless _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _camera _wireless _profiles.
-- Returns wireless profile assigned to the given camera.
-version_added: '2.16.0'
+  - Get all devices _camera _wireless _profiles.
+  - Returns wireless profile assigned to the given camera.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_camera_wireless_profiles_info
+notes:
+  - SDK Method used are camera.Camera.get_device_camera_wireless_profiles,
+  - Paths used are get /devices/{serial}/camera/wirelessProfiles,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getDeviceCameraWirelessProfiles
-  description: Complete reference of the getDeviceCameraWirelessProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-wireless-profiles
-notes:
-  - SDK Method used are
-    camera.Camera.get_device_camera_wireless_profiles,
-
-  - Paths used are
-    get /devices/{serial}/camera/wirelessProfiles,
+  - description: Complete reference of the getDeviceCameraWirelessProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-camera-wireless-profiles
+    name: Cisco Meraki documentation for camera getDeviceCameraWirelessProfiles
+short_description: Information module for devices _camera _wireless _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _camera _wireless _profiles
   cisco.meraki.devices_camera_wireless_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_gateway_lan.py b/plugins/modules/devices_cellular_gateway_lan.py
index 903d23468..88c1f4db1 100644
--- a/plugins/modules/devices_cellular_gateway_lan.py
+++ b/plugins/modules/devices_cellular_gateway_lan.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_gateway_lan
-short_description: Resource module for devices _cellular _gateway _lan
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _cellular _gateway _lan.
-- Update the LAN Settings for a single MG.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _cellular _gateway _lan.
+  - Update the LAN Settings for a single MG.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_gateway_lan
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_device_cellular_gateway_lan,
+  - Paths used are put /devices/{serial}/cellularGateway/lan,
 options:
   fixedIpAssignments:
     description: List of all fixed IP assignments for a single MG.
@@ -49,54 +49,49 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateDeviceCellularGatewayLan
-  description: Complete reference of the updateDeviceCellularGatewayLan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-gateway-lan
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_device_cellular_gateway_lan,
-
-  - Paths used are
-    put /devices/{serial}/cellularGateway/lan,
+  - description: Complete reference of the updateDeviceCellularGatewayLan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-gateway-lan
+    name: Cisco Meraki documentation for cellularGateway updateDeviceCellularGatewayLan
+short_description: Resource module for devices _cellular _gateway _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_cellular_gateway_lan:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     fixedIpAssignments:
-    - ip: 192.168.0.10
-      mac: 0b:00:00:00:00:ac
-      name: server 1
+      - ip: 192.168.0.10
+        mac: 0b:00:00:00:00:ac
+        name: server 1
     reservedIpRanges:
-    - comment: A reserved IP range
-      end: 192.168.1.1
-      start: 192.168.1.0
+      - comment: A reserved IP range
+        end: 192.168.1.1
+        start: 192.168.1.0
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_gateway_lan_info.py b/plugins/modules/devices_cellular_gateway_lan_info.py
index 4dfe8461b..8fde1a1a3 100644
--- a/plugins/modules/devices_cellular_gateway_lan_info.py
+++ b/plugins/modules/devices_cellular_gateway_lan_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_gateway_lan_info
-short_description: Information module for devices _cellular _gateway _lan
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _cellular _gateway _lan.
-- Show the LAN Settings of a MG.
-version_added: '2.16.0'
+  - Get all devices _cellular _gateway _lan.
+  - Show the LAN Settings of a MG.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_gateway_lan_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_device_cellular_gateway_lan,
+  - Paths used are get /devices/{serial}/cellularGateway/lan,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getDeviceCellularGatewayLan
-  description: Complete reference of the getDeviceCellularGatewayLan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-gateway-lan
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_device_cellular_gateway_lan,
-
-  - Paths used are
-    get /devices/{serial}/cellularGateway/lan,
+  - description: Complete reference of the getDeviceCellularGatewayLan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-gateway-lan
+    name: Cisco Meraki documentation for cellularGateway getDeviceCellularGatewayLan
+short_description: Information module for devices _cellular _gateway _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _cellular _gateway _lan
   cisco.meraki.devices_cellular_gateway_lan_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_gateway_port_forwarding_rules.py b/plugins/modules/devices_cellular_gateway_port_forwarding_rules.py
index fcbf355f4..0ac35424d 100644
--- a/plugins/modules/devices_cellular_gateway_port_forwarding_rules.py
+++ b/plugins/modules/devices_cellular_gateway_port_forwarding_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_gateway_port_forwarding_rules
-short_description: Resource module for devices _cellular _gateway _port _forwarding _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _cellular _gateway _port _forwarding _rules.
-- Updates the port forwarding rules for a single MG.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _cellular _gateway _port _forwarding
+    _rules.
+  - Updates the port forwarding rules for a single MG.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_gateway_port_forwarding_rules
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_device_cellular_gateway_port_forwarding_rules,
+  - Paths used are put /devices/{serial}/cellularGateway/portForwardingRules,
 options:
   rules:
     description: An array of port forwarding params.
@@ -35,8 +36,8 @@
           resource that you wish to make available on the WAN.
         type: str
       localPort:
-        description: A port or port ranges that will receive the forwarded traffic from
-          the WAN.
+        description: A port or port ranges that will receive the forwarded traffic
+          from the WAN.
         type: str
       name:
         description: A descriptive name for the rule.
@@ -53,56 +54,53 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateDeviceCellularGatewayPortForwardingRules
-  description: Complete reference of the updateDeviceCellularGatewayPortForwardingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-gateway-port-forwarding-rules
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_device_cellular_gateway_port_forwarding_rules,
-
-  - Paths used are
-    put /devices/{serial}/cellularGateway/portForwardingRules,
+  - description: Complete reference of the updateDeviceCellularGatewayPortForwardingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-gateway-port-forwarding-rules
+    name: Cisco Meraki documentation for cellularGateway updateDeviceCellularGatewayPortForwardingRules
+short_description: Resource module for devices _cellular _gateway _port _forwarding
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_cellular_gateway_port_forwarding_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     rules:
-    - access: any
-      allowedIps:
-      - 10.10.10.10
-      - 10.10.10.11
-      lanIp: 172.31.128.5
-      localPort: '4'
-      name: test
-      protocol: tcp
-      publicPort: 11-12
+      - access: any
+        allowedIps:
+          - 10.10.10.10
+          - 10.10.10.11
+        lanIp: 172.31.128.5
+        localPort: '4'
+        name: test
+        protocol: tcp
+        publicPort: 11-12
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_gateway_port_forwarding_rules_info.py b/plugins/modules/devices_cellular_gateway_port_forwarding_rules_info.py
index 9a4d9ca4b..db3d27634 100644
--- a/plugins/modules/devices_cellular_gateway_port_forwarding_rules_info.py
+++ b/plugins/modules/devices_cellular_gateway_port_forwarding_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_gateway_port_forwarding_rules_info
-short_description: Information module for devices _cellular _gateway _port _forwarding _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _cellular _gateway _port _forwarding _rules.
-- Returns the port forwarding rules for a single MG.
-version_added: '2.16.0'
+  - Get all devices _cellular _gateway _port _forwarding _rules.
+  - Returns the port forwarding rules for a single MG.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_gateway_port_forwarding_rules_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_device_cellular_gateway_port_forwarding_rules,
+  - Paths used are get /devices/{serial}/cellularGateway/portForwardingRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getDeviceCellularGatewayPortForwardingRules
-  description: Complete reference of the getDeviceCellularGatewayPortForwardingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-gateway-port-forwarding-rules
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_device_cellular_gateway_port_forwarding_rules,
-
-  - Paths used are
-    get /devices/{serial}/cellularGateway/portForwardingRules,
+  - description: Complete reference of the getDeviceCellularGatewayPortForwardingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-gateway-port-forwarding-rules
+    name: Cisco Meraki documentation for cellularGateway getDeviceCellularGatewayPortForwardingRules
+short_description: Information module for devices _cellular _gateway _port _forwarding
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _cellular _gateway _port _forwarding _rules
   cisco.meraki.devices_cellular_gateway_port_forwarding_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_sims.py b/plugins/modules/devices_cellular_sims.py
index ad56608c4..59e15b0ba 100644
--- a/plugins/modules/devices_cellular_sims.py
+++ b/plugins/modules/devices_cellular_sims.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_sims
-short_description: Resource module for devices _cellular _sims
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _cellular _sims.
-- Updates the SIM and APN configurations for a cellular device.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _cellular _sims.
+  - Updates the SIM and APN configurations for a cellular device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_sims
+notes:
+  - SDK Method used are devices.Devices.update_device_cellular_sims,
+  - Paths used are put /devices/{serial}/cellular/sims,
 options:
   serial:
     description: Serial path parameter.
@@ -30,10 +30,10 @@
         type: int
     type: dict
   simOrdering:
-    description: Specifies the ordering of all SIMs for an MG primary, secondary, and
-      not-in-use (when applicable). It's required for devices with 3 or more SIMs and
-      can be used in place of 'isPrimary' for dual-SIM devices. To indicate eSIM, use
-      'sim3'. Sim failover will occur only between primary and secondary sim slots.
+    description: Specifies the ordering of all SIMs for an MG primary, secondary,
+      and not-in-use (when applicable). It's required for devices with 3 or more SIMs
+      and can be used in place of 'isPrimary' for dual-SIM devices. To indicate eSIM,
+      use 'sim3'. Sim failover will occur only between primary and secondary sim slots.
     elements: str
     type: list
   sims:
@@ -46,15 +46,16 @@
         elements: dict
         suboptions:
           allowedIpTypes:
-            description: IP versions to support (permitted values include 'ipv4', 'ipv6').
+            description: IP versions to support (permitted values include 'ipv4',
+              'ipv6').
             elements: str
             type: list
           authentication:
             description: APN authentication configurations.
             suboptions:
               password:
-                description: APN password, if type is set (if APN password is not supplied,
-                  the password is left unchanged).
+                description: APN password, if type is set (if APN password is not
+                  supplied, the password is left unchanged).
                 type: str
               type:
                 description: APN auth type.
@@ -68,13 +69,13 @@
             type: str
         type: list
       isPrimary:
-        description: If true, this SIM is activated on platform bootup. It must be true
-          on single-SIM devices and is a required field for dual-SIM MGs unless it is
-          being configured using 'simOrdering'.
+        description: If true, this SIM is activated on platform bootup. It must be
+          true on single-SIM devices and is a required field for dual-SIM MGs unless
+          it is being configured using 'simOrdering'.
         type: bool
       simOrder:
-        description: Priority of SIM slot being configured. Use a value between 1 and
-          total number of SIMs available. The value must be unique for each SIM.
+        description: Priority of SIM slot being configured. Use a value between 1
+          and total number of SIMs available. The value must be unique for each SIM.
         type: int
       slot:
         description: SIM slot being configured. Must be 'sim1' on single-sim devices.
@@ -82,66 +83,61 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices updateDeviceCellularSims
-  description: Complete reference of the updateDeviceCellularSims API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-sims
-notes:
-  - SDK Method used are
-    devices.Devices.update_device_cellular_sims,
-
-  - Paths used are
-    put /devices/{serial}/cellular/sims,
+  - description: Complete reference of the updateDeviceCellularSims API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-cellular-sims
+    name: Cisco Meraki documentation for devices updateDeviceCellularSims
+short_description: Resource module for devices _cellular _sims
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_cellular_sims:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     serial: string
     simFailover:
       enabled: true
       timeout: 300
     simOrdering:
-    - sim1
-    - sim2
-    - sim3
+      - sim1
+      - sim2
+      - sim3
     sims:
-    - apns:
-      - allowedIpTypes:
-        - ipv4
-        - ipv6
-        authentication:
-          password: secret
-          type: pap
-          username: milesmeraki
-        name: internet
-      isPrimary: false
-      simOrder: 3
-      slot: sim1
-
+      - apns:
+          - allowedIpTypes:
+              - ipv4
+              - ipv6
+            authentication:
+              password: secret
+              type: pap
+              username: milesmeraki
+            name: internet
+        isPrimary: false
+        simOrder: 3
+        slot: sim1
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_cellular_sims_info.py b/plugins/modules/devices_cellular_sims_info.py
index b5ca938ce..26338b9e7 100644
--- a/plugins/modules/devices_cellular_sims_info.py
+++ b/plugins/modules/devices_cellular_sims_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_cellular_sims_info
-short_description: Information module for devices _cellular _sims
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _cellular _sims.
-- Return the SIM and APN configurations for a cellular device.
-version_added: '2.16.0'
+  - Get all devices _cellular _sims.
+  - Return the SIM and APN configurations for a cellular device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_cellular_sims_info
+notes:
+  - SDK Method used are devices.Devices.get_device_cellular_sims,
+  - Paths used are get /devices/{serial}/cellular/sims,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDeviceCellularSims
-  description: Complete reference of the getDeviceCellularSims API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-sims
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_cellular_sims,
-
-  - Paths used are
-    get /devices/{serial}/cellular/sims,
+  - description: Complete reference of the getDeviceCellularSims API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-cellular-sims
+    name: Cisco Meraki documentation for devices getDeviceCellularSims
+short_description: Information module for devices _cellular _sims
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _cellular _sims
   cisco.meraki.devices_cellular_sims_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_info.py b/plugins/modules/devices_info.py
index ca08dc610..b3df1707e 100644
--- a/plugins/modules/devices_info.py
+++ b/plugins/modules/devices_info.py
@@ -5,190 +5,206 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_info
-short_description: Information module for devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices.
-- Get devices by id.
-- List the devices in an organization that have been assigned to a network.
-- Return a single device.
-- Returns a historical log of all commands.
-- Returns information about the command's execution, including the status.
-version_added: '2.16.0'
+  - Get all devices.
+  - Get devices by id.
+  - List the devices in an organization that have been assigned to a network.
+  - Return a single device.
+  - Returns a historical log of all commands.
+  - Returns information about the command's execution, including the status.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: devices_info
+notes:
+  - SDK Method used are devices.Devices.get_device_sensor_command, devices.Devices.get_organization_devices,
+  - Paths used are get /devices/{serial}, get /devices/{serial}/sensor/commands, get
+    /devices/{serial}/sensor/commands/{commandId}, get /organizations/{organizationId}/devices,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  serial:
-    description:
-    - Serial path parameter.
-    type: str
   commandId:
     description:
-    - CommandId path parameter. Command ID.
+      - CommandId path parameter. Command ID.
     type: str
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Filter results by whether or not
+        the device''s configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  configurationUpdatedAfter:
+  headers:
+    description: Additional headers.
+    type: dict
+  mac:
     description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Filter results by whether or not the device's configuration has
-      been updated after the given timestamp.
+      - 'Mac query parameter. Optional parameter to filter devices by MAC address.
+        All returned devices will have a MAC address that contains the search term
+        or is an exact match.
+
+        '
     type: str
-  networkIds:
+  macs:
     description:
-    - NetworkIds query parameter. Optional parameter to filter devices by network.
+      - 'Macs query parameter. Optional parameter to filter devices by one or more
+        MAC addresses. All returned devices will have a MAC address that is an exact
+        match.
+
+        '
     elements: str
     type: list
-  productTypes:
+  model:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter devices by product type. Valid types are
-      wireless, appliance, switch, systemsManager, camera, cellularGateway, sensor, wirelessController, and
-      secureConnect.
-    elements: str
-    type: list
-  tags:
+      - 'Model query parameter. Optional parameter to filter devices by model. All
+        returned devices will have a model that contains the search term or is an
+        exact match.
+
+        '
+    type: str
+  models:
     description:
-    - Tags query parameter. Optional parameter to filter devices by tags.
+      - 'Models query parameter. Optional parameter to filter devices by one or more
+        models. All returned devices will have a model that is an exact match.
+
+        '
     elements: str
     type: list
-  tagsFilterType:
-    description:
-    - >
-      TagsFilterType query parameter. Optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return networks which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
-    type: str
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter devices by name. All returned devices will have a name
-      that contains the search term or is an exact match.
+      - 'Name query parameter. Optional parameter to filter devices by name. All returned
+        devices will have a name that contains the search term or is an exact match.
+
+        '
     type: str
-  mac:
+  networkIds:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter devices by MAC address. All returned devices will have a
-      MAC address that contains the search term or is an exact match.
-    type: str
-  model:
+      - NetworkIds query parameter. Optional parameter to filter devices by network.
+    elements: str
+    type: list
+  organizationId:
     description:
-    - >
-      Model query parameter. Optional parameter to filter devices by model. All returned devices will have a model
-      that contains the search term or is an exact match.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  macs:
+  perPage:
     description:
-    - >
-      Macs query parameter. Optional parameter to filter devices by one or more MAC addresses. All returned
-      devices will have a MAC address that is an exact match.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  productTypes:
+    description:
+      - 'ProductTypes query parameter. Optional parameter to filter devices by product
+        type. Valid types are wireless, appliance, switch, systemsManager, camera,
+        cellularGateway, sensor, wirelessController, and secureConnect.
+
+        '
     elements: str
     type: list
-  serials:
+  sensorAlertProfileIds:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter devices by one or more serial numbers. All returned
-      devices will have a serial number that is an exact match.
+      - 'SensorAlertProfileIds query parameter. Optional parameter to filter devices
+        by the alert profiles that are bound to them. Only applies to sensor devices.
+
+        '
     elements: str
     type: list
   sensorMetrics:
     description:
-    - >
-      SensorMetrics query parameter. Optional parameter to filter devices by the metrics that they provide. Only
-      applies to sensor devices.
+      - 'SensorMetrics query parameter. Optional parameter to filter devices by the
+        metrics that they provide. Only applies to sensor devices.
+
+        '
     elements: str
     type: list
-  sensorAlertProfileIds:
+  serial:
     description:
-    - >
-      SensorAlertProfileIds query parameter. Optional parameter to filter devices by the alert profiles that are
-      bound to them. Only applies to sensor devices.
+      - Serial path parameter.
+    type: str
+  serials:
+    description:
+      - 'Serials query parameter. Optional parameter to filter devices by one or more
+        serial numbers. All returned devices will have a serial number that is an
+        exact match.
+
+        '
     elements: str
     type: list
-  models:
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  tags:
     description:
-    - >
-      Models query parameter. Optional parameter to filter devices by one or more models. All returned devices
-      will have a model that is an exact match.
+      - Tags query parameter. Optional parameter to filter devices by tags.
     elements: str
     type: list
+  tagsFilterType:
+    description:
+      - 'TagsFilterType query parameter. Optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return networks which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDevice
-  description: Complete reference of the getDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device
-- name: Cisco Meraki documentation for devices getDeviceSensorCommand
-  description: Complete reference of the getDeviceSensorCommand API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-command
-- name: Cisco Meraki documentation for devices getDeviceSensorCommands
-  description: Complete reference of the getDeviceSensorCommands API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-commands
-- name: Cisco Meraki documentation for devices getOrganizationDevices
-  description: Complete reference of the getOrganizationDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_sensor_command,
-    devices.Devices.get_organization_devices,
-
-  - Paths used are
-    get /devices/{serial},
-    get /devices/{serial}/sensor/commands,
-    get /devices/{serial}/sensor/commands/{commandId},
-    get /organizations/{organizationId}/devices,
+  - description: Complete reference of the getDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device
+    name: Cisco Meraki documentation for devices getDevice
+  - description: Complete reference of the getDeviceSensorCommand API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-command
+    name: Cisco Meraki documentation for devices getDeviceSensorCommand
+  - description: Complete reference of the getDeviceSensorCommands API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-commands
+    name: Cisco Meraki documentation for devices getDeviceSensorCommands
+  - description: Complete reference of the getOrganizationDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices
+    name: Cisco Meraki documentation for devices getOrganizationDevices
+short_description: Information module for devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices
   cisco.meraki.devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -210,33 +226,31 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get devices by id
   cisco.meraki.devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     commandId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_arp_table.py b/plugins/modules/devices_live_tools_arp_table.py
index b9379faae..c414e0203 100644
--- a/plugins/modules/devices_live_tools_arp_table.py
+++ b/plugins/modules/devices_live_tools_arp_table.py
@@ -5,19 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_arp_table
-short_description: Resource module for devices _live _tools _arp _table
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _arp _table.
-- >
-   Enqueue a job to perform a ARP table request for the device. This endpoint currently supports switches. This
-   endpoint has a sustained rate limit of one request every five seconds per device, with an allowed burst of five
-   requests.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _arp _table.
+  - 'Enqueue a job to perform a ARP table request for the device. This endpoint currently
+    supports switches. This endpoint has a sustained rate limit of one request every
+    five seconds per device, with an allowed burst of five requests.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_arp_table
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_arp_table,
+  - Paths used are post /devices/{serial}/liveTools/arpTable,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -27,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -40,56 +41,52 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   serial:
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsArpTable
-  description: Complete reference of the createDeviceLiveToolsArpTable API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-arp-table
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_arp_table,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/arpTable,
+  - description: Complete reference of the createDeviceLiveToolsArpTable API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-arp-table
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsArpTable
+short_description: Resource module for devices _live _tools _arp _table
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_arp_table:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -99,7 +96,6 @@
       sharedSecret: secret
       url: https://webhook.site/28efa24e-f830-4d9f-a12b-fbb9e5035031
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_arp_table_info.py b/plugins/modules/devices_live_tools_arp_table_info.py
index 2dba5c22e..10f370b5a 100644
--- a/plugins/modules/devices_live_tools_arp_table_info.py
+++ b/plugins/modules/devices_live_tools_arp_table_info.py
@@ -5,23 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_arp_table_info
-short_description: Information module for devices _live _tools _arp _table
+author: Francisco Munoz (@fmunoz)
 description: Information module for devices _livetools _arptable
-version_added: '2.16.0'
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_arp_table_info
+notes:
+  - Paths used are
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
-notes:
-  - Paths used are
+  - meraki >= 2.4.9
+  - python >= 3.5
+short_description: Information module for devices _live _tools _arp _table
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/devices_live_tools_cable_test.py b/plugins/modules/devices_live_tools_cable_test.py
index 7f7722025..d4c7284bd 100644
--- a/plugins/modules/devices_live_tools_cable_test.py
+++ b/plugins/modules/devices_live_tools_cable_test.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_cable_test
-short_description: Resource module for devices _live _tools _cable _test
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _cable _test.
-- >
-   Enqueue a job to perform a cable test for the device on the specified ports. This endpoint has a sustained rate
-   limit of one request every five seconds per device, with an allowed burst of five requests.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _cable _test.
+  - 'Enqueue a job to perform a cable test for the device on the specified ports.
+    This endpoint has a sustained rate limit of one request every five seconds per
+    device, with an allowed burst of five requests.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_cable_test
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_cable_test,
+  - Paths used are post /devices/{serial}/liveTools/cableTest,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -26,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -39,62 +41,58 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   ports:
-    description: A list of ports for which to perform the cable test. For Catalyst switches,
-      IOS interface names are also supported, such as "GigabitEthernet1/0/8", "Gi1/0/8",
-      or even "1/0/8".
+    description: A list of ports for which to perform the cable test. For Catalyst
+      switches, IOS interface names are also supported, such as "GigabitEthernet1/0/8",
+      "Gi1/0/8", or even "1/0/8".
     elements: str
     type: list
   serial:
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsCableTest
-  description: Complete reference of the createDeviceLiveToolsCableTest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-cable-test
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_cable_test,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/cableTest,
+  - description: Complete reference of the createDeviceLiveToolsCableTest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-cable-test
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsCableTest
+short_description: Resource module for devices _live _tools _cable _test
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_cable_test:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -104,10 +102,9 @@
       sharedSecret: secret
       url: https://webhook.site/28efa24e-f830-4d9f-a12b-fbb9e5035031
     ports:
-    - '2'
-    - '8'
+      - '2'
+      - '8'
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_cable_test_info.py b/plugins/modules/devices_live_tools_cable_test_info.py
index e068f7966..28f5eb087 100644
--- a/plugins/modules/devices_live_tools_cable_test_info.py
+++ b/plugins/modules/devices_live_tools_cable_test_info.py
@@ -5,23 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_cable_test_info
-short_description: Information module for devices _live _tools _cable _test
+author: Francisco Munoz (@fmunoz)
 description: Information module for devices _livetools_cabletest
-version_added: '2.16.0'
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_cable_test_info
+notes:
+  - Paths used are
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
-notes:
-  - Paths used are
+  - meraki >= 2.4.9
+  - python >= 3.5
+short_description: Information module for devices _live _tools _cable _test
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/devices_live_tools_leds_blink.py b/plugins/modules/devices_live_tools_leds_blink.py
index 997c50814..19da97cf5 100644
--- a/plugins/modules/devices_live_tools_leds_blink.py
+++ b/plugins/modules/devices_live_tools_leds_blink.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_leds_blink
-short_description: Resource module for devices _live _tools _leds _blink
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _leds _blink.
-- Enqueue a job to blink LEDs on a device. This endpoint has a rate limit of one request every 10 seconds.
-version_added: '2.20.0'
+  - Manage operation create of the resource devices _live _tools _leds _blink.
+  - Enqueue a job to blink LEDs on a device. This endpoint has a rate limit of one
+    request every 10 seconds.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_leds_blink
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_leds_blink,
+  - Paths used are post /devices/{serial}/liveTools/leds/blink,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -24,8 +25,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -37,13 +38,13 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   duration:
@@ -53,43 +54,39 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsLedsBlink
-  description: Complete reference of the createDeviceLiveToolsLedsBlink API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-leds-blink
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_leds_blink,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/leds/blink,
+  - description: Complete reference of the createDeviceLiveToolsLedsBlink API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-leds-blink
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsLedsBlink
+short_description: Resource module for devices _live _tools _leds _blink
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_leds_blink:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     callback:
       httpServer:
         id: aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
@@ -99,7 +96,6 @@
       url: https://webhook.site/28efa24e-f830-4d9f-a12b-fbb9e5035031
     duration: 30
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_ping.py b/plugins/modules/devices_live_tools_ping.py
index 3e6ea705b..2aa2c4ea8 100644
--- a/plugins/modules/devices_live_tools_ping.py
+++ b/plugins/modules/devices_live_tools_ping.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_ping
-short_description: Resource module for devices _live _tools _ping
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _ping.
-- >
-   Enqueue a job to ping a target host from the device. This endpoint has a sustained rate limit of one request every
-   five seconds per device, with an allowed burst of five requests.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _ping.
+  - 'Enqueue a job to ping a target host from the device. This endpoint has a sustained
+    rate limit of one request every five seconds per device, with an allowed burst
+    of five requests.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_ping
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_ping,
+  - Paths used are post /devices/{serial}/liveTools/ping,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -26,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -39,13 +41,13 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   count:
@@ -58,43 +60,39 @@
     description: FQDN, IPv4 or IPv6 address.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsPing
-  description: Complete reference of the createDeviceLiveToolsPing API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-ping
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_ping,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/ping,
+  - description: Complete reference of the createDeviceLiveToolsPing API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-ping
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsPing
+short_description: Resource module for devices _live _tools _ping
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_ping:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -106,7 +104,6 @@
     count: 2
     serial: string
     target: 75.75.75.75
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_ping_device.py b/plugins/modules/devices_live_tools_ping_device.py
index 1d8f71b85..0c29cb173 100644
--- a/plugins/modules/devices_live_tools_ping_device.py
+++ b/plugins/modules/devices_live_tools_ping_device.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_ping_device
-short_description: Resource module for devices _live _tools _ping _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _ping _device.
-- >
-   Enqueue a job to check connectivity status to the device. This endpoint has a sustained rate limit of one request
-   every five seconds per device, with an allowed burst of five requests.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _ping _device.
+  - 'Enqueue a job to check connectivity status to the device. This endpoint has a
+    sustained rate limit of one request every five seconds per device, with an allowed
+    burst of five requests.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_ping_device
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_ping_device,
+  - Paths used are post /devices/{serial}/liveTools/pingDevice,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -26,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -39,13 +41,13 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   count:
@@ -55,43 +57,39 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsPingDevice
-  description: Complete reference of the createDeviceLiveToolsPingDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-ping-device
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_ping_device,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/pingDevice,
+  - description: Complete reference of the createDeviceLiveToolsPingDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-ping-device
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsPingDevice
+short_description: Resource module for devices _live _tools _ping _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_ping_device:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -102,7 +100,6 @@
       url: https://webhook.site/28efa24e-f830-4d9f-a12b-fbb9e5035031
     count: 3
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_ping_device_info.py b/plugins/modules/devices_live_tools_ping_device_info.py
index 08c904cb8..857d77783 100644
--- a/plugins/modules/devices_live_tools_ping_device_info.py
+++ b/plugins/modules/devices_live_tools_ping_device_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_ping_device_info
-short_description: Information module for devices _live _tools _ping _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get devices _live _tools _ping _device by id.
-- Return a ping device job. Latency unit in response is in milliseconds. Size is in bytes.
-version_added: '2.16.0'
+  - Get devices _live _tools _ping _device by id.
+  - Return a ping device job. Latency unit in response is in milliseconds. Size is
+    in bytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_ping_device_info
+notes:
+  - SDK Method used are devices.Devices.get_device_live_tools_ping_device,
+  - Paths used are get /devices/{serial}/liveTools/pingDevice/{id},
 options:
   headers:
     description: Additional headers.
     type: dict
-  serial:
+  id:
     description:
-    - Serial path parameter.
+      - Id path parameter.
     type: str
-  id:
+  serial:
     description:
-    - Id path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDeviceLiveToolsPingDevice
-  description: Complete reference of the getDeviceLiveToolsPingDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-live-tools-ping-device
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_live_tools_ping_device,
-
-  - Paths used are
-    get /devices/{serial}/liveTools/pingDevice/{id},
+  - description: Complete reference of the getDeviceLiveToolsPingDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-live-tools-ping-device
+    name: Cisco Meraki documentation for devices getDeviceLiveToolsPingDevice
+short_description: Information module for devices _live _tools _ping _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get devices _live _tools _ping _device by id
   cisco.meraki.devices_live_tools_ping_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     id: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_ping_info.py b/plugins/modules/devices_live_tools_ping_info.py
index ebec3ceee..bfd939dc7 100644
--- a/plugins/modules/devices_live_tools_ping_info.py
+++ b/plugins/modules/devices_live_tools_ping_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_ping_info
-short_description: Information module for devices _live _tools _ping
+author: Francisco Munoz (@fmunoz)
 description:
-- Get devices _live _tools _ping by id.
-- Return a ping job. Latency unit in response is in milliseconds. Size is in bytes.
-version_added: '2.16.0'
+  - Get devices _live _tools _ping by id.
+  - Return a ping job. Latency unit in response is in milliseconds. Size is in bytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_ping_info
+notes:
+  - SDK Method used are devices.Devices.get_device_live_tools_ping,
+  - Paths used are get /devices/{serial}/liveTools/ping/{id},
 options:
   headers:
     description: Additional headers.
     type: dict
-  serial:
+  id:
     description:
-    - Serial path parameter.
+      - Id path parameter.
     type: str
-  id:
+  serial:
     description:
-    - Id path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDeviceLiveToolsPing
-  description: Complete reference of the getDeviceLiveToolsPing API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-live-tools-ping
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_live_tools_ping,
-
-  - Paths used are
-    get /devices/{serial}/liveTools/ping/{id},
+  - description: Complete reference of the getDeviceLiveToolsPing API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-live-tools-ping
+    name: Cisco Meraki documentation for devices getDeviceLiveToolsPing
+short_description: Information module for devices _live _tools _ping
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get devices _live _tools _ping by id
   cisco.meraki.devices_live_tools_ping_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     id: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_throughput_test.py b/plugins/modules/devices_live_tools_throughput_test.py
index ce052b398..6ebd25c9f 100644
--- a/plugins/modules/devices_live_tools_throughput_test.py
+++ b/plugins/modules/devices_live_tools_throughput_test.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_throughput_test
-short_description: Resource module for devices _live _tools _throughput _test
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _throughput _test.
-- >
-   Enqueue a job to test a device throughput, the test will run for 10 secs to test throughput. This endpoint has a
-   rate limit of one request every five seconds per device.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _throughput _test.
+  - 'Enqueue a job to test a device throughput, the test will run for 10 secs to test
+    throughput. This endpoint has a rate limit of one request every five seconds per
+    device.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_throughput_test
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_throughput_test,
+  - Paths used are post /devices/{serial}/liveTools/throughputTest,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -26,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -39,56 +41,52 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   serial:
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsThroughputTest
-  description: Complete reference of the createDeviceLiveToolsThroughputTest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-throughput-test
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_throughput_test,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/throughputTest,
+  - description: Complete reference of the createDeviceLiveToolsThroughputTest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-throughput-test
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsThroughputTest
+short_description: Resource module for devices _live _tools _throughput _test
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_throughput_test:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -98,7 +96,6 @@
       sharedSecret: secret
       url: https://webhook.site/28efa24e-f830-4d9f-a12b-fbb9e5035031
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_throughput_test_info.py b/plugins/modules/devices_live_tools_throughput_test_info.py
index b940f89a9..a392eb54c 100644
--- a/plugins/modules/devices_live_tools_throughput_test_info.py
+++ b/plugins/modules/devices_live_tools_throughput_test_info.py
@@ -5,23 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_throughput_test_info
-short_description: Information module for devices _live _tools _throughput _test
+author: Francisco Munoz (@fmunoz)
 description: Information module for devices _live _tools _throughput _test
-version_added: '2.16.0'
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_throughput_test_info
+notes:
+  - Paths used are
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
-notes:
-  - Paths used are
+  - meraki >= 2.4.9
+  - python >= 3.5
+short_description: Information module for devices _live _tools _throughput _test
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/devices_live_tools_wake_on_lan.py b/plugins/modules/devices_live_tools_wake_on_lan.py
index 250f3845f..a0813b6c3 100644
--- a/plugins/modules/devices_live_tools_wake_on_lan.py
+++ b/plugins/modules/devices_live_tools_wake_on_lan.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_wake_on_lan
-short_description: Resource module for devices _live _tools _wake _on _lan
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _live _tools _wake _on _lan.
-- >
-   Enqueue a job to send a Wake-on-LAN packet from the device. This endpoint has a sustained rate limit of one
-   request every five seconds per device, with an allowed burst of five requests.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _live _tools _wake _on _lan.
+  - 'Enqueue a job to send a Wake-on-LAN packet from the device. This endpoint has
+    a sustained rate limit of one request every five seconds per device, with an allowed
+    burst of five requests.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_wake_on_lan
+notes:
+  - SDK Method used are devices.Devices.create_device_live_tools_wake_on_lan,
+  - Paths used are post /devices/{serial}/liveTools/wakeOnLan,
 options:
   callback:
     description: Details for the callback. Please include either an httpServerId OR
@@ -26,8 +28,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -39,13 +41,13 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   mac:
@@ -58,43 +60,39 @@
     description: The target's VLAN (1 to 4094).
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices createDeviceLiveToolsWakeOnLan
-  description: Complete reference of the createDeviceLiveToolsWakeOnLan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-wake-on-lan
-notes:
-  - SDK Method used are
-    devices.Devices.create_device_live_tools_wake_on_lan,
-
-  - Paths used are
-    post /devices/{serial}/liveTools/wakeOnLan,
+  - description: Complete reference of the createDeviceLiveToolsWakeOnLan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-wake-on-lan
+    name: Cisco Meraki documentation for devices createDeviceLiveToolsWakeOnLan
+short_description: Resource module for devices _live _tools _wake _on _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_live_tools_wake_on_lan:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     callback:
       httpServer:
@@ -106,7 +104,6 @@
     mac: 00:11:22:33:44:55
     serial: string
     vlanId: 12
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_live_tools_wake_on_lan_info.py b/plugins/modules/devices_live_tools_wake_on_lan_info.py
index 124c5c849..668107c6b 100644
--- a/plugins/modules/devices_live_tools_wake_on_lan_info.py
+++ b/plugins/modules/devices_live_tools_wake_on_lan_info.py
@@ -5,23 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_live_tools_wake_on_lan_info
-short_description: Information module for devices _live _tools _wake _on _lan
+author: Francisco Munoz (@fmunoz)
 description: Information module for devices _livetools _throughputtest
-version_added: '2.16.0'
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_live_tools_wake_on_lan_info
+notes:
+  - Paths used are
 options:
   headers:
     description: Additional headers.
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
-notes:
-  - Paths used are
+  - meraki >= 2.4.9
+  - python >= 3.5
+short_description: Information module for devices _live _tools _wake _on _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/devices_lldp_cdp_info.py b/plugins/modules/devices_lldp_cdp_info.py
index 13f1e7175..1f893a65d 100644
--- a/plugins/modules/devices_lldp_cdp_info.py
+++ b/plugins/modules/devices_lldp_cdp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_lldp_cdp_info
-short_description: Information module for devices _lldp _cdp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _lldp _cdp.
-- List LLDP and CDP information for a device.
-version_added: '2.16.0'
+  - Get all devices _lldp _cdp.
+  - List LLDP and CDP information for a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_lldp_cdp_info
+notes:
+  - SDK Method used are devices.Devices.get_device_lldp_cdp,
+  - Paths used are get /devices/{serial}/lldpCdp,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDeviceLldpCdp
-  description: Complete reference of the getDeviceLldpCdp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-lldp-cdp
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_lldp_cdp,
-
-  - Paths used are
-    get /devices/{serial}/lldpCdp,
+  - description: Complete reference of the getDeviceLldpCdp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-lldp-cdp
+    name: Cisco Meraki documentation for devices getDeviceLldpCdp
+short_description: Information module for devices _lldp _cdp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _lldp _cdp
   cisco.meraki.devices_lldp_cdp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_management_interface.py b/plugins/modules/devices_management_interface.py
index 7c3e0451a..17e4a7093 100644
--- a/plugins/modules/devices_management_interface.py
+++ b/plugins/modules/devices_management_interface.py
@@ -5,17 +5,18 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_management_interface
-short_description: Resource module for devices _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create and update of the resource devices _management _interface.
-- Reboot a device. This endpoint has a sustained rate limit of one request every 60 seconds.
-- Update the management interface settings for a device.
-version_added: '2.16.0'
+  - Manage operations create and update of the resource devices _management _interface.
+  - Reboot a device. This endpoint has a sustained rate limit of one request every
+    60 seconds.
+  - Update the management interface settings for a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_management_interface
+notes:
+  - SDK Method used are devices.Devices.reboot_device, devices.Devices.update_device_management_interface,
+  - Paths used are post /devices/{serial}/reboot, put /devices/{serial}/managementInterface,
 options:
   serial:
     description: Serial path parameter.
@@ -44,8 +45,8 @@
           whether usingStaticIp is true or false.
         type: int
       wanEnabled:
-        description: Enable or disable the interface (only for MX devices). Valid values
-          are 'enabled', 'disabled', and 'not configured'.
+        description: Enable or disable the interface (only for MX devices). Valid
+          values are 'enabled', 'disabled', and 'not configured'.
         type: str
     type: dict
   wan2:
@@ -72,59 +73,53 @@
           whether usingStaticIp is true or false.
         type: int
       wanEnabled:
-        description: Enable or disable the interface (only for MX devices). Valid values
-          are 'enabled', 'disabled', and 'not configured'.
+        description: Enable or disable the interface (only for MX devices). Valid
+          values are 'enabled', 'disabled', and 'not configured'.
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices rebootDevice
-  description: Complete reference of the rebootDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!reboot-device
-- name: Cisco Meraki documentation for devices updateDeviceManagementInterface
-  description: Complete reference of the updateDeviceManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-management-interface
-notes:
-  - SDK Method used are
-    devices.Devices.reboot_device,
-    devices.Devices.update_device_management_interface,
-
-  - Paths used are
-    post /devices/{serial}/reboot,
-    put /devices/{serial}/managementInterface,
+  - description: Complete reference of the rebootDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!reboot-device
+    name: Cisco Meraki documentation for devices rebootDevice
+  - description: Complete reference of the updateDeviceManagementInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-management-interface
+    name: Cisco Meraki documentation for devices updateDeviceManagementInterface
+short_description: Resource module for devices _management _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_management_interface:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     serial: string
     wan1:
       staticDns:
-      - 1.2.3.2
-      - 1.2.3.3
+        - 1.2.3.2
+        - 1.2.3.3
       staticGatewayIp: 1.2.3.1
       staticIp: 1.2.3.4
       staticSubnetMask: 255.255.255.0
@@ -133,40 +128,38 @@
       wanEnabled: not configured
     wan2:
       staticDns:
-      - 1.2.3.2
-      - 1.2.3.3
+        - 1.2.3.2
+        - 1.2.3.3
       staticGatewayIp: 1.2.3.1
       staticIp: 1.2.3.4
       staticSubnetMask: 255.255.255.0
       usingStaticIp: false
       vlan: 2
       wanEnabled: enabled
-
 - name: Create
   cisco.meraki.devices_management_interface:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_management_interface_info.py b/plugins/modules/devices_management_interface_info.py
index 15c5731e9..a2da90cf0 100644
--- a/plugins/modules/devices_management_interface_info.py
+++ b/plugins/modules/devices_management_interface_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_management_interface_info
-short_description: Information module for devices _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _management _interface.
-- Return the management interface settings for a device.
-version_added: '2.16.0'
+  - Get all devices _management _interface.
+  - Return the management interface settings for a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_management_interface_info
+notes:
+  - SDK Method used are devices.Devices.get_device_management_interface,
+  - Paths used are get /devices/{serial}/managementInterface,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for devices getDeviceManagementInterface
-  description: Complete reference of the getDeviceManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-management-interface
-notes:
-  - SDK Method used are
-    devices.Devices.get_device_management_interface,
-
-  - Paths used are
-    get /devices/{serial}/managementInterface,
+  - description: Complete reference of the getDeviceManagementInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-management-interface
+    name: Cisco Meraki documentation for devices getDeviceManagementInterface
+short_description: Information module for devices _management _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _management _interface
   cisco.meraki.devices_management_interface_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_sensor_relationships.py b/plugins/modules/devices_sensor_relationships.py
index 16d18deb0..8360764ca 100644
--- a/plugins/modules/devices_sensor_relationships.py
+++ b/plugins/modules/devices_sensor_relationships.py
@@ -5,21 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_sensor_relationships
-short_description: Resource module for devices _sensor _relationships
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _sensor _relationships.
-- Assign one or more sensor roles to a given sensor or camera device.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _sensor _relationships.
+  - Assign one or more sensor roles to a given sensor or camera device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_sensor_relationships
+notes:
+  - SDK Method used are sensor.Sensor.update_device_sensor_relationships,
+  - Paths used are put /devices/{serial}/sensor/relationships,
 options:
   livestream:
     description: A role defined between an MT sensor and an MV camera that adds the
-      camera's livestream to the sensor's details page. Snapshots from the camera will
-      also appear in alert notifications that the sensor triggers.
+      camera's livestream to the sensor's details page. Snapshots from the camera
+      will also appear in alert notifications that the sensor triggers.
     suboptions:
       relatedDevices:
         description: An array of the related devices for the role.
@@ -34,49 +34,44 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor updateDeviceSensorRelationships
-  description: Complete reference of the updateDeviceSensorRelationships API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-sensor-relationships
-notes:
-  - SDK Method used are
-    sensor.Sensor.update_device_sensor_relationships,
-
-  - Paths used are
-    put /devices/{serial}/sensor/relationships,
+  - description: Complete reference of the updateDeviceSensorRelationships API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-sensor-relationships
+    name: Cisco Meraki documentation for sensor updateDeviceSensorRelationships
+short_description: Resource module for devices _sensor _relationships
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_sensor_relationships:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     livestream:
       relatedDevices:
-      - serial: string
+        - serial: string
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_sensor_relationships_info.py b/plugins/modules/devices_sensor_relationships_info.py
index 2bdf296c5..2622220ab 100644
--- a/plugins/modules/devices_sensor_relationships_info.py
+++ b/plugins/modules/devices_sensor_relationships_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_sensor_relationships_info
-short_description: Information module for devices _sensor _relationships
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _sensor _relationships.
-- List the sensor roles for a given sensor or camera device.
-version_added: '2.16.0'
+  - Get all devices _sensor _relationships.
+  - List the sensor roles for a given sensor or camera device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_sensor_relationships_info
+notes:
+  - SDK Method used are sensor.Sensor.get_device_sensor_relationships,
+  - Paths used are get /devices/{serial}/sensor/relationships,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getDeviceSensorRelationships
-  description: Complete reference of the getDeviceSensorRelationships API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-relationships
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_device_sensor_relationships,
-
-  - Paths used are
-    get /devices/{serial}/sensor/relationships,
+  - description: Complete reference of the getDeviceSensorRelationships API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-sensor-relationships
+    name: Cisco Meraki documentation for sensor getDeviceSensorRelationships
+short_description: Information module for devices _sensor _relationships
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _sensor _relationships
   cisco.meraki.devices_sensor_relationships_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_ports.py b/plugins/modules/devices_switch_ports.py
index 56af0608f..6afa65e41 100644
--- a/plugins/modules/devices_switch_ports.py
+++ b/plugins/modules/devices_switch_ports.py
@@ -5,25 +5,25 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_ports
-short_description: Resource module for devices _switch _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _switch _ports.
-- Update a switch port.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _switch _ports.
+  - Update a switch port.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_ports
+notes:
+  - SDK Method used are switch.Switch.update_device_switch_port,
+  - Paths used are put /devices/{serial}/switch/ports/{portId},
 options:
   accessPolicyNumber:
     description: The number of a custom access policy to configure on the switch port.
       Only applicable when 'accessPolicyType' is 'Custom access policy'.
     type: int
   accessPolicyType:
-    description: The type of the access policy of the switch port. Only applicable to
-      access ports. Can be one of 'Open', 'Custom access policy', 'MAC allow list' or
-      'Sticky MAC allow list'.
+    description: The type of the access policy of the switch port. Only applicable
+      to access ports. Can be one of 'Open', 'Custom access policy', 'MAC allow list'
+      or 'Sticky MAC allow list'.
     type: str
   adaptivePolicyGroupId:
     description: The adaptive policy group ID that will be used to tag traffic through
@@ -59,9 +59,9 @@
     description: The link speed for the switch port.
     type: str
   macAllowList:
-    description: Only devices with MAC addresses specified in this list will have access
-      to this port. Up to 20 MAC addresses can be defined. Only applicable when 'accessPolicyType'
-      is 'MAC allow list'.
+    description: Only devices with MAC addresses specified in this list will have
+      access to this port. Up to 20 MAC addresses can be defined. Only applicable
+      when 'accessPolicyType' is 'MAC allow list'.
     elements: str
     type: list
   name:
@@ -69,8 +69,8 @@
     type: str
   peerSgtCapable:
     description: If true, Peer SGT is enabled for traffic through this switch port.
-      Applicable to trunk port only, not access port. Cannot be applied to a port on
-      a switch bound to profile.
+      Applicable to trunk port only, not access port. Cannot be applied to a port
+      on a switch bound to profile.
     type: bool
   poeEnabled:
     description: The PoE status of the switch port.
@@ -79,17 +79,19 @@
     description: PortId path parameter. Port ID.
     type: str
   portScheduleId:
-    description: The ID of the port schedule. A value of null will clear the port schedule.
+    description: The ID of the port schedule. A value of null will clear the port
+      schedule.
     type: str
   profile:
     description: Profile attributes.
     suboptions:
       enabled:
-        description: When enabled, override this port's configuration with a port profile.
+        description: When enabled, override this port's configuration with a port
+          profile.
         type: bool
       id:
-        description: When enabled, the ID of the port profile used to override the port's
-          configuration.
+        description: When enabled, the ID of the port profile used to override the
+          port's configuration.
         type: str
       iname:
         description: When enabled, the IName of the profile.
@@ -102,8 +104,8 @@
     description: Serial path parameter.
     type: str
   stickyMacAllowList:
-    description: The initial list of MAC addresses for sticky Mac allow list. Only applicable
-      when 'accessPolicyType' is 'Sticky MAC allow list'.
+    description: The initial list of MAC addresses for sticky Mac allow list. Only
+      applicable when 'accessPolicyType' is 'Sticky MAC allow list'.
     elements: str
     type: list
   stickyMacAllowListLimit:
@@ -129,50 +131,46 @@
       Enforce). Default configuration is Alert only.
     type: str
   vlan:
-    description: The VLAN of the switch port. For a trunk port, this is the native VLAN.
-      A null value will clear the value set for trunk ports.
+    description: The VLAN of the switch port. For a trunk port, this is the native
+      VLAN. A null value will clear the value set for trunk ports.
     type: int
   voiceVlan:
     description: The voice VLAN of the switch port. Only applicable to access ports.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateDeviceSwitchPort
-  description: Complete reference of the updateDeviceSwitchPort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-port
-notes:
-  - SDK Method used are
-    switch.Switch.update_device_switch_port,
-
-  - Paths used are
-    put /devices/{serial}/switch/ports/{portId},
+  - description: Complete reference of the updateDeviceSwitchPort API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-port
+    name: Cisco Meraki documentation for switch updateDeviceSwitchPort
+short_description: Resource module for devices _switch _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.devices_switch_ports:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPolicyNumber: 2
     accessPolicyType: Sticky MAC allow list
@@ -186,8 +184,8 @@
     isolationEnabled: false
     linkNegotiation: Auto negotiate
     macAllowList:
-    - 34:56:fe:ce:8e:a0
-    - 34:56:fe:ce:8e:a1
+      - 34:56:fe:ce:8e:a0
+      - 34:56:fe:ce:8e:a1
     name: My switch port
     peerSgtCapable: false
     poeEnabled: true
@@ -200,19 +198,18 @@
     rstpEnabled: true
     serial: string
     stickyMacAllowList:
-    - 34:56:fe:ce:8e:b0
-    - 34:56:fe:ce:8e:b1
+      - 34:56:fe:ce:8e:b0
+      - 34:56:fe:ce:8e:b1
     stickyMacAllowListLimit: 5
     stormControlEnabled: true
     stpGuard: disabled
     tags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     type: access
     udld: Alert only
     vlan: 10
     voiceVlan: 20
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_ports_cycle.py b/plugins/modules/devices_switch_ports_cycle.py
index 9739b0427..9317ede9a 100644
--- a/plugins/modules/devices_switch_ports_cycle.py
+++ b/plugins/modules/devices_switch_ports_cycle.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_ports_cycle
-short_description: Resource module for devices _switch _ports _cycle
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource devices _switch _ports _cycle.
-- Cycle a set of switch ports.
-version_added: '2.16.0'
+  - Manage operation create of the resource devices _switch _ports _cycle.
+  - Cycle a set of switch ports.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_ports_cycle
+notes:
+  - SDK Method used are switch.Switch.cycle_device_switch_ports,
+  - Paths used are post /devices/{serial}/switch/ports/cycle,
 options:
   ports:
     description: List of switch ports.
@@ -24,50 +24,45 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch cycleDeviceSwitchPorts
-  description: Complete reference of the cycleDeviceSwitchPorts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!cycle-device-switch-ports
-notes:
-  - SDK Method used are
-    switch.Switch.cycle_device_switch_ports,
-
-  - Paths used are
-    post /devices/{serial}/switch/ports/cycle,
+  - description: Complete reference of the cycleDeviceSwitchPorts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!cycle-device-switch-ports
+    name: Cisco Meraki documentation for switch cycleDeviceSwitchPorts
+short_description: Resource module for devices _switch _ports _cycle
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_switch_ports_cycle:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ports:
-    - '1'
-    - 2-5
-    - 1_MA-MOD-8X10G_1
-    - 1_MA-MOD-8X10G_2-1_MA-MOD-8X10G_8
+      - '1'
+      - 2-5
+      - 1_MA-MOD-8X10G_1
+      - 1_MA-MOD-8X10G_2-1_MA-MOD-8X10G_8
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_ports_info.py b/plugins/modules/devices_switch_ports_info.py
index 804e28c76..da7aa2f78 100644
--- a/plugins/modules/devices_switch_ports_info.py
+++ b/plugins/modules/devices_switch_ports_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_ports_info
-short_description: Information module for devices _switch _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _ports.
-- Get devices _switch _ports by id.
-- List the switch ports for a switch.
-- Return a switch port.
-version_added: '2.16.0'
+  - Get all devices _switch _ports.
+  - Get devices _switch _ports by id.
+  - List the switch ports for a switch.
+  - Return a switch port.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_ports_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_port, switch.Switch.get_device_switch_ports,
+  - Paths used are get /devices/{serial}/switch/ports, get /devices/{serial}/switch/ports/{portId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  serial:
+  portId:
     description:
-    - Serial path parameter.
+      - PortId path parameter. Port ID.
     type: str
-  portId:
+  serial:
     description:
-    - PortId path parameter. Port ID.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchPort
-  description: Complete reference of the getDeviceSwitchPort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-port
-- name: Cisco Meraki documentation for switch getDeviceSwitchPorts
-  description: Complete reference of the getDeviceSwitchPorts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-ports
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_port,
-    switch.Switch.get_device_switch_ports,
-
-  - Paths used are
-    get /devices/{serial}/switch/ports,
-    get /devices/{serial}/switch/ports/{portId},
+  - description: Complete reference of the getDeviceSwitchPort API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-port
+    name: Cisco Meraki documentation for switch getDeviceSwitchPort
+  - description: Complete reference of the getDeviceSwitchPorts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-ports
+    name: Cisco Meraki documentation for switch getDeviceSwitchPorts
+short_description: Information module for devices _switch _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _ports
   cisco.meraki.devices_switch_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 - name: Get devices _switch _ports by id
   cisco.meraki.devices_switch_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     portId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_ports_statuses_info.py b/plugins/modules/devices_switch_ports_statuses_info.py
index 9d401611b..a4b1d7c22 100644
--- a/plugins/modules/devices_switch_ports_statuses_info.py
+++ b/plugins/modules/devices_switch_ports_statuses_info.py
@@ -5,78 +5,75 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_ports_statuses_info
-short_description: Information module for devices _switch _ports _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _ports _statuses.
-- Return the status for all the ports of a switch.
-version_added: '2.16.0'
+  - Get all devices _switch _ports _statuses.
+  - Return the status for all the ports of a switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_ports_statuses_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_ports_statuses,
+  - Paths used are get /devices/{serial}/switch/ports/statuses,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchPortsStatuses
-  description: Complete reference of the getDeviceSwitchPortsStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-ports-statuses
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_ports_statuses,
-
-  - Paths used are
-    get /devices/{serial}/switch/ports/statuses,
+  - description: Complete reference of the getDeviceSwitchPortsStatuses API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-ports-statuses
+    name: Cisco Meraki documentation for switch getDeviceSwitchPortsStatuses
+short_description: Information module for devices _switch _ports _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _ports _statuses
   cisco.meraki.devices_switch_ports_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     timespan: 0
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_interfaces.py b/plugins/modules/devices_switch_routing_interfaces.py
index 73acae1ed..fc5f2f59f 100644
--- a/plugins/modules/devices_switch_routing_interfaces.py
+++ b/plugins/modules/devices_switch_routing_interfaces.py
@@ -5,23 +5,26 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_interfaces
-short_description: Resource module for devices _switch _routing _interfaces
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource devices _switch _routing _interfaces.
-- Create a layer 3 interface for a switch.
-- Delete a layer 3 interface from the switch.
-- Update a layer 3 interface for a switch.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource devices _switch _routing
+    _interfaces.
+  - Create a layer 3 interface for a switch.
+  - Delete a layer 3 interface from the switch.
+  - Update a layer 3 interface for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_interfaces
+notes:
+  - SDK Method used are switch.Switch.create_device_switch_routing_interface, switch.Switch.delete_device_switch_routing_interface,
+    switch.Switch.update_device_switch_routing_interface,
+  - Paths used are post /devices/{serial}/switch/routing/interfaces, delete /devices/{serial}/switch/routing/interfaces/{interfaceId},
+    put /devices/{serial}/switch/routing/interfaces/{interfaceId},
 options:
   defaultGateway:
     description: The next hop for any traffic that isn't going to a directly connected
-      subnet or over a static route. This IP address must exist in a subnet with a routed
-      interface. Required if this is the first IPv4 interface.
+      subnet or over a static route. This IP address must exist in a subnet with a
+      routed interface. Required if this is the first IPv4 interface.
     type: str
   interfaceId:
     description: InterfaceId path parameter. Interface ID.
@@ -34,19 +37,21 @@
     description: The IPv6 settings of the interface.
     suboptions:
       address:
-        description: The IPv6 address of the interface. Required if assignmentMode is
-          'static'. Must not be included if assignmentMode is 'eui-64'.
+        description: The IPv6 address of the interface. Required if assignmentMode
+          is 'static'. Must not be included if assignmentMode is 'eui-64'.
         type: str
       assignmentMode:
         description: The IPv6 assignment mode for the interface. Can be either 'eui-64'
           or 'static'.
         type: str
       gateway:
-        description: The IPv6 default gateway of the interface. Required if prefix is
-          defined and this is the first interface with IPv6 configured for the switch.
+        description: The IPv6 default gateway of the interface. Required if prefix
+          is defined and this is the first interface with IPv6 configured for the
+          switch.
         type: str
       prefix:
-        description: The IPv6 prefix of the interface. Required if IPv6 object is included.
+        description: The IPv6 prefix of the interface. Required if IPv6 object is
+          included.
         type: str
     type: dict
   multicastRouting:
@@ -80,56 +85,49 @@
       10.1.1.0/24).
     type: str
   vlanId:
-    description: The VLAN this routed interface is on. VLAN must be between 1 and 4094.
+    description: The VLAN this routed interface is on. VLAN must be between 1 and
+      4094.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createDeviceSwitchRoutingInterface
-  description: Complete reference of the createDeviceSwitchRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-switch-routing-interface
-- name: Cisco Meraki documentation for switch deleteDeviceSwitchRoutingInterface
-  description: Complete reference of the deleteDeviceSwitchRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-device-switch-routing-interface
-- name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingInterface
-  description: Complete reference of the updateDeviceSwitchRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-interface
-notes:
-  - SDK Method used are
-    switch.Switch.create_device_switch_routing_interface,
-    switch.Switch.delete_device_switch_routing_interface,
-    switch.Switch.update_device_switch_routing_interface,
-
-  - Paths used are
-    post /devices/{serial}/switch/routing/interfaces,
-    delete /devices/{serial}/switch/routing/interfaces/{interfaceId},
-    put /devices/{serial}/switch/routing/interfaces/{interfaceId},
+  - description: Complete reference of the createDeviceSwitchRoutingInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-switch-routing-interface
+    name: Cisco Meraki documentation for switch createDeviceSwitchRoutingInterface
+  - description: Complete reference of the deleteDeviceSwitchRoutingInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-device-switch-routing-interface
+    name: Cisco Meraki documentation for switch deleteDeviceSwitchRoutingInterface
+  - description: Complete reference of the updateDeviceSwitchRoutingInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-interface
+    name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingInterface
+short_description: Resource module for devices _switch _routing _interfaces
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_switch_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultGateway: 192.168.1.1
     interfaceIp: 192.168.1.2
@@ -147,55 +145,53 @@
     serial: string
     subnet: 192.168.1.0/24
     vlanId: 100
-
 - name: Delete by id
   cisco.meraki.devices_switch_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     interfaceId: string
     serial: string
-
 - name: Update by id
   cisco.meraki.devices_switch_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultGateway: 192.168.1.1
     interfaceId: string
@@ -214,7 +210,6 @@
     serial: string
     subnet: 192.168.1.0/24
     vlanId: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_interfaces_dhcp.py b/plugins/modules/devices_switch_routing_interfaces_dhcp.py
index 1b8fb6e0b..fad2d55a6 100644
--- a/plugins/modules/devices_switch_routing_interfaces_dhcp.py
+++ b/plugins/modules/devices_switch_routing_interfaces_dhcp.py
@@ -5,39 +5,40 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_interfaces_dhcp
-short_description: Resource module for devices _switch _routing _interfaces _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _switch _routing _interfaces _dhcp.
-- Update a layer 3 interface DHCP configuration for a switch.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _switch _routing _interfaces _dhcp.
+  - Update a layer 3 interface DHCP configuration for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_interfaces_dhcp
+notes:
+  - SDK Method used are switch.Switch.update_device_switch_routing_interface_dhcp,
+  - Paths used are put /devices/{serial}/switch/routing/interfaces/{interfaceId}/dhcp,
 options:
   bootFileName:
     description: The PXE boot server filename for the DHCP server running on the switch
       interface.
     type: str
   bootNextServer:
-    description: The PXE boot server IP for the DHCP server running on the switch interface.
+    description: The PXE boot server IP for the DHCP server running on the switch
+      interface.
     type: str
   bootOptionsEnabled:
-    description: Enable DHCP boot options to provide PXE boot options configs for the
-      dhcp server running on the switch interface.
+    description: Enable DHCP boot options to provide PXE boot options configs for
+      the dhcp server running on the switch interface.
     type: bool
   dhcpLeaseTime:
-    description: The DHCP lease time config for the dhcp server running on switch interface
-      ('30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1 week').
+    description: The DHCP lease time config for the dhcp server running on switch
+      interface ('30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1 week').
     type: str
   dhcpMode:
     description: The DHCP mode options for the switch interface ('dhcpDisabled', 'dhcpRelay'
       or 'dhcpServer').
     type: str
   dhcpOptions:
-    description: Array of DHCP options consisting of code, type and value for the DHCP
-      server running on the switch interface.
+    description: Array of DHCP options consisting of code, type and value for the
+      DHCP server running on the switch interface.
     elements: dict
     suboptions:
       code:
@@ -52,8 +53,8 @@
         type: str
     type: list
   dhcpRelayServerIps:
-    description: The DHCP relay server IPs to which DHCP packets would get relayed for
-      the switch interface.
+    description: The DHCP relay server IPs to which DHCP packets would get relayed
+      for the switch interface.
     elements: str
     type: list
   dnsCustomNameservers:
@@ -65,8 +66,8 @@
       interface ('googlePublicDns', 'openDns' or 'custom').
     type: str
   fixedIpAssignments:
-    description: Array of DHCP fixed IP assignments for the DHCP server running on the
-      switch interface.
+    description: Array of DHCP fixed IP assignments for the DHCP server running on
+      the switch interface.
     elements: dict
     suboptions:
       ip:
@@ -84,8 +85,8 @@
     description: InterfaceId path parameter. Interface ID.
     type: str
   reservedIpRanges:
-    description: Array of DHCP reserved IP assignments for the DHCP server running on
-      the switch interface.
+    description: Array of DHCP reserved IP assignments for the DHCP server running
+      on the switch interface.
     elements: dict
     suboptions:
       comment:
@@ -102,43 +103,40 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingInterfaceDhcp
-  description: Complete reference of the updateDeviceSwitchRoutingInterfaceDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-interface-dhcp
-notes:
-  - SDK Method used are
-    switch.Switch.update_device_switch_routing_interface_dhcp,
-
-  - Paths used are
-    put /devices/{serial}/switch/routing/interfaces/{interfaceId}/dhcp,
+  - description: Complete reference of the updateDeviceSwitchRoutingInterfaceDhcp
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-interface-dhcp
+    name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingInterfaceDhcp
+short_description: Resource module for devices _switch _routing _interfaces _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_switch_routing_interfaces_dhcp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bootFileName: home_boot_file
     bootNextServer: 1.2.3.4
@@ -146,25 +144,24 @@
     dhcpLeaseTime: 1 day
     dhcpMode: dhcpServer
     dhcpOptions:
-    - code: '5'
-      type: text
-      value: five
+      - code: '5'
+        type: text
+        value: five
     dhcpRelayServerIps:
-    - 1.2.3.4
+      - 1.2.3.4
     dnsCustomNameservers:
-    - 8.8.8.8, 8.8.4.4
+      - 8.8.8.8, 8.8.4.4
     dnsNameserversOption: custom
     fixedIpAssignments:
-    - ip: 192.168.1.12
-      mac: 22:33:44:55:66:77
-      name: Cisco Meraki valued client
+      - ip: 192.168.1.12
+        mac: 22:33:44:55:66:77
+        name: Cisco Meraki valued client
     interfaceId: string
     reservedIpRanges:
-    - comment: A reserved IP range
-      end: 192.168.1.10
-      start: 192.168.1.1
+      - comment: A reserved IP range
+        end: 192.168.1.10
+        start: 192.168.1.1
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_interfaces_dhcp_info.py b/plugins/modules/devices_switch_routing_interfaces_dhcp_info.py
index b4cb02f4e..1fcf20057 100644
--- a/plugins/modules/devices_switch_routing_interfaces_dhcp_info.py
+++ b/plugins/modules/devices_switch_routing_interfaces_dhcp_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_interfaces_dhcp_info
-short_description: Information module for devices _switch _routing _interfaces _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _routing _interfaces _dhcp.
-- Return a layer 3 interface DHCP configuration for a switch.
-version_added: '2.16.0'
+  - Get all devices _switch _routing _interfaces _dhcp.
+  - Return a layer 3 interface DHCP configuration for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_interfaces_dhcp_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_routing_interface_dhcp,
+  - Paths used are get /devices/{serial}/switch/routing/interfaces/{interfaceId}/dhcp,
 options:
   headers:
     description: Additional headers.
     type: dict
-  serial:
+  interfaceId:
     description:
-    - Serial path parameter.
+      - InterfaceId path parameter. Interface ID.
     type: str
-  interfaceId:
+  serial:
     description:
-    - InterfaceId path parameter. Interface ID.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterfaceDhcp
-  description: Complete reference of the getDeviceSwitchRoutingInterfaceDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interface-dhcp
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_routing_interface_dhcp,
-
-  - Paths used are
-    get /devices/{serial}/switch/routing/interfaces/{interfaceId}/dhcp,
+  - description: Complete reference of the getDeviceSwitchRoutingInterfaceDhcp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interface-dhcp
+    name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterfaceDhcp
+short_description: Information module for devices _switch _routing _interfaces _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _routing _interfaces _dhcp
   cisco.meraki.devices_switch_routing_interfaces_dhcp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     interfaceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_interfaces_info.py b/plugins/modules/devices_switch_routing_interfaces_info.py
index e37cc899a..43b6e1ebe 100644
--- a/plugins/modules/devices_switch_routing_interfaces_info.py
+++ b/plugins/modules/devices_switch_routing_interfaces_info.py
@@ -5,102 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_interfaces_info
-short_description: Information module for devices _switch _routing _interfaces
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _routing _interfaces.
-- Get devices _switch _routing _interfaces by id.
-- List layer 3 interfaces for a switch. Those for a stack may be found under switch stack routing.
-- Return a layer 3 interface for a switch.
-version_added: '2.16.0'
+  - Get all devices _switch _routing _interfaces.
+  - Get devices _switch _routing _interfaces by id.
+  - List layer 3 interfaces for a switch. Those for a stack may be found under switch
+    stack routing.
+  - Return a layer 3 interface for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_interfaces_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_routing_interface, switch.Switch.get_device_switch_routing_interfaces,
+  - Paths used are get /devices/{serial}/switch/routing/interfaces, get /devices/{serial}/switch/routing/interfaces/{interfaceId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  serial:
+  interfaceId:
     description:
-    - Serial path parameter.
+      - InterfaceId path parameter. Interface ID.
     type: str
-  interfaceId:
+  serial:
     description:
-    - InterfaceId path parameter. Interface ID.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterface
-  description: Complete reference of the getDeviceSwitchRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interface
-- name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterfaces
-  description: Complete reference of the getDeviceSwitchRoutingInterfaces API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interfaces
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_routing_interface,
-    switch.Switch.get_device_switch_routing_interfaces,
-
-  - Paths used are
-    get /devices/{serial}/switch/routing/interfaces,
-    get /devices/{serial}/switch/routing/interfaces/{interfaceId},
+  - description: Complete reference of the getDeviceSwitchRoutingInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interface
+    name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterface
+  - description: Complete reference of the getDeviceSwitchRoutingInterfaces API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-interfaces
+    name: Cisco Meraki documentation for switch getDeviceSwitchRoutingInterfaces
+short_description: Information module for devices _switch _routing _interfaces
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _routing _interfaces
   cisco.meraki.devices_switch_routing_interfaces_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 - name: Get devices _switch _routing _interfaces by id
   cisco.meraki.devices_switch_routing_interfaces_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     interfaceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_static_routes.py b/plugins/modules/devices_switch_routing_static_routes.py
index 2e0d92835..fddd1d401 100644
--- a/plugins/modules/devices_switch_routing_static_routes.py
+++ b/plugins/modules/devices_switch_routing_static_routes.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_static_routes
-short_description: Resource module for devices _switch _routing _static _routes
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource devices _switch _routing _static _routes.
-- Create a layer 3 static route for a switch.
-- Delete a layer 3 static route for a switch.
-- Update a layer 3 static route for a switch.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource devices _switch _routing
+    _static _routes.
+  - Create a layer 3 static route for a switch.
+  - Delete a layer 3 static route for a switch.
+  - Update a layer 3 static route for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_static_routes
+notes:
+  - SDK Method used are switch.Switch.create_device_switch_routing_static_route, switch.Switch.delete_device_switch_routing_static_route,
+    switch.Switch.update_device_switch_routing_static_route,
+  - Paths used are post /devices/{serial}/switch/routing/staticRoutes, delete /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
+    put /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
 options:
   advertiseViaOspfEnabled:
     description: Option to advertise static route via OSPF.
@@ -45,53 +48,45 @@
       in CIDR notation (ex. 1.2.3.0/24).
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createDeviceSwitchRoutingStaticRoute
-  description: Complete reference of the createDeviceSwitchRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-device-switch-routing-static-route
-- name: Cisco Meraki documentation for switch deleteDeviceSwitchRoutingStaticRoute
-  description: Complete reference of the deleteDeviceSwitchRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-device-switch-routing-static-route
-- name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingStaticRoute
-  description: Complete reference of the updateDeviceSwitchRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-static-route
-notes:
-  - SDK Method used are
-    switch.Switch.create_device_switch_routing_static_route,
-    switch.Switch.delete_device_switch_routing_static_route,
-    switch.Switch.update_device_switch_routing_static_route,
-
-  - Paths used are
-    post /devices/{serial}/switch/routing/staticRoutes,
-    delete /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
-    put /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
+  - description: Complete reference of the createDeviceSwitchRoutingStaticRoute API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-device-switch-routing-static-route
+    name: Cisco Meraki documentation for switch createDeviceSwitchRoutingStaticRoute
+  - description: Complete reference of the deleteDeviceSwitchRoutingStaticRoute API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-device-switch-routing-static-route
+    name: Cisco Meraki documentation for switch deleteDeviceSwitchRoutingStaticRoute
+  - description: Complete reference of the updateDeviceSwitchRoutingStaticRoute API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-routing-static-route
+    name: Cisco Meraki documentation for switch updateDeviceSwitchRoutingStaticRoute
+short_description: Resource module for devices _switch _routing _static _routes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.devices_switch_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     advertiseViaOspfEnabled: false
     name: My route
@@ -99,55 +94,53 @@
     preferOverOspfRoutesEnabled: false
     serial: string
     subnet: 192.168.1.0/24
-
 - name: Delete by id
   cisco.meraki.devices_switch_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     serial: string
     staticRouteId: string
-
 - name: Update by id
   cisco.meraki.devices_switch_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     advertiseViaOspfEnabled: false
     managementNextHop: 1.2.3.5
@@ -157,7 +150,6 @@
     serial: string
     staticRouteId: string
     subnet: 192.168.1.0/24
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_routing_static_routes_info.py b/plugins/modules/devices_switch_routing_static_routes_info.py
index 0eea47c72..a702ef3fe 100644
--- a/plugins/modules/devices_switch_routing_static_routes_info.py
+++ b/plugins/modules/devices_switch_routing_static_routes_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_routing_static_routes_info
-short_description: Information module for devices _switch _routing _static _routes
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _routing _static _routes.
-- Get devices _switch _routing _static _routes by id.
-- List layer 3 static routes for a switch.
-- Return a layer 3 static route for a switch.
-version_added: '2.16.0'
+  - Get all devices _switch _routing _static _routes.
+  - Get devices _switch _routing _static _routes by id.
+  - List layer 3 static routes for a switch.
+  - Return a layer 3 static route for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_routing_static_routes_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_routing_static_route, switch.Switch.get_device_switch_routing_static_routes,
+  - Paths used are get /devices/{serial}/switch/routing/staticRoutes, get /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
   staticRouteId:
     description:
-    - StaticRouteId path parameter. Static route ID.
+      - StaticRouteId path parameter. Static route ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchRoutingStaticRoute
-  description: Complete reference of the getDeviceSwitchRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-static-route
-- name: Cisco Meraki documentation for switch getDeviceSwitchRoutingStaticRoutes
-  description: Complete reference of the getDeviceSwitchRoutingStaticRoutes API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-static-routes
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_routing_static_route,
-    switch.Switch.get_device_switch_routing_static_routes,
-
-  - Paths used are
-    get /devices/{serial}/switch/routing/staticRoutes,
-    get /devices/{serial}/switch/routing/staticRoutes/{staticRouteId},
+  - description: Complete reference of the getDeviceSwitchRoutingStaticRoute API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-static-route
+    name: Cisco Meraki documentation for switch getDeviceSwitchRoutingStaticRoute
+  - description: Complete reference of the getDeviceSwitchRoutingStaticRoutes API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-routing-static-routes
+    name: Cisco Meraki documentation for switch getDeviceSwitchRoutingStaticRoutes
+short_description: Information module for devices _switch _routing _static _routes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _routing _static _routes
   cisco.meraki.devices_switch_routing_static_routes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 - name: Get devices _switch _routing _static _routes by id
   cisco.meraki.devices_switch_routing_static_routes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
     staticRouteId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_warm_spare.py b/plugins/modules/devices_switch_warm_spare.py
index dd2be3bf0..6b3d3b746 100644
--- a/plugins/modules/devices_switch_warm_spare.py
+++ b/plugins/modules/devices_switch_warm_spare.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_warm_spare
-short_description: Resource module for devices _switch _warm _spare
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _switch _warm _spare.
-- >
-   Update warm spare configuration for a switch. The spare will use the same L3 configuration as the primary. Note
-   that this will irreversibly destroy any existing L3 configuration on the spare.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _switch _warm _spare.
+  - 'Update warm spare configuration for a switch. The spare will use the same L3
+    configuration as the primary. Note that this will irreversibly destroy any existing
+    L3 configuration on the spare.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_warm_spare
+notes:
+  - SDK Method used are switch.Switch.update_device_switch_warm_spare,
+  - Paths used are put /devices/{serial}/switch/warmSpare,
 options:
   enabled:
     description: Enable or disable warm spare for a switch.
@@ -28,48 +30,43 @@
     description: Serial number of the warm spare switch.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateDeviceSwitchWarmSpare
-  description: Complete reference of the updateDeviceSwitchWarmSpare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-warm-spare
-notes:
-  - SDK Method used are
-    switch.Switch.update_device_switch_warm_spare,
-
-  - Paths used are
-    put /devices/{serial}/switch/warmSpare,
+  - description: Complete reference of the updateDeviceSwitchWarmSpare API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-switch-warm-spare
+    name: Cisco Meraki documentation for switch updateDeviceSwitchWarmSpare
+short_description: Resource module for devices _switch _warm _spare
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_switch_warm_spare:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     serial: string
     spareSerial: Q234-ABCD-0002
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_switch_warm_spare_info.py b/plugins/modules/devices_switch_warm_spare_info.py
index 0152cfcea..9a1afadaf 100644
--- a/plugins/modules/devices_switch_warm_spare_info.py
+++ b/plugins/modules/devices_switch_warm_spare_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_switch_warm_spare_info
-short_description: Information module for devices _switch _warm _spare
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _switch _warm _spare.
-- Return warm spare configuration for a switch.
-version_added: '2.16.0'
+  - Get all devices _switch _warm _spare.
+  - Return warm spare configuration for a switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_switch_warm_spare_info
+notes:
+  - SDK Method used are switch.Switch.get_device_switch_warm_spare,
+  - Paths used are get /devices/{serial}/switch/warmSpare,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getDeviceSwitchWarmSpare
-  description: Complete reference of the getDeviceSwitchWarmSpare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-warm-spare
-notes:
-  - SDK Method used are
-    switch.Switch.get_device_switch_warm_spare,
-
-  - Paths used are
-    get /devices/{serial}/switch/warmSpare,
+  - description: Complete reference of the getDeviceSwitchWarmSpare API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-switch-warm-spare
+    name: Cisco Meraki documentation for switch getDeviceSwitchWarmSpare
+short_description: Information module for devices _switch _warm _spare
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _switch _warm _spare
   cisco.meraki.devices_switch_warm_spare_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_alternate_management_interface_ipv6.py b/plugins/modules/devices_wireless_alternate_management_interface_ipv6.py
index 0180cb9ab..a28d69e6b 100644
--- a/plugins/modules/devices_wireless_alternate_management_interface_ipv6.py
+++ b/plugins/modules/devices_wireless_alternate_management_interface_ipv6.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_alternate_management_interface_ipv6
-short_description: Resource module for devices _wireless _alternate _management _interface _ipv6
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _wireless _alternate _management _interface _ipv6.
-- Update alternate management interface IPv6 address.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _wireless _alternate _management
+    _interface _ipv6.
+  - Update alternate management interface IPv6 address.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_alternate_management_interface_ipv6
+notes:
+  - SDK Method used are wireless.Wireless.update_device_wireless_alternate_management_interface_ipv6,
+  - Paths used are put /devices/{serial}/wireless/alternateManagementInterface/ipv6,
 options:
   addresses:
     description: Configured alternate management interface addresses.
@@ -33,8 +34,8 @@
         description: The DNS servers settings for this address.
         suboptions:
           addresses:
-            description: Up to 2 nameserver addresses to use, ordered in priority from
-              highest to lowest priority.
+            description: Up to 2 nameserver addresses to use, ordered in priority
+              from highest to lowest priority.
             elements: str
             type: list
         type: dict
@@ -50,55 +51,52 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateDeviceWirelessAlternateManagementInterfaceIpv6
-  description: Complete reference of the updateDeviceWirelessAlternateManagementInterfaceIpv6 API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-alternate-management-interface-ipv6
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_device_wireless_alternate_management_interface_ipv6,
-
-  - Paths used are
-    put /devices/{serial}/wireless/alternateManagementInterface/ipv6,
+  - description: Complete reference of the updateDeviceWirelessAlternateManagementInterfaceIpv6
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-alternate-management-interface-ipv6
+    name: Cisco Meraki documentation for wireless updateDeviceWirelessAlternateManagementInterfaceIpv6
+short_description: Resource module for devices _wireless _alternate _management _interface
+  _ipv6
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_wireless_alternate_management_interface_ipv6:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     addresses:
-    - address: 2001:db8:3c4d:15::1
-      assignmentMode: static
-      gateway: fe80:db8:c15:c0:d0c::10ca:1d02
-      nameservers:
-        addresses:
-        - 2001:db8:3c4d:15::1
-        - 2001:db8:3c4d:15::1
-      prefix: 2001:db8:3c4d:15::/64
-      protocol: ipv6
+      - address: 2001:db8:3c4d:15::1
+        assignmentMode: static
+        gateway: fe80:db8:c15:c0:d0c::10ca:1d02
+        nameservers:
+          addresses:
+            - 2001:db8:3c4d:15::1
+            - 2001:db8:3c4d:15::1
+        prefix: 2001:db8:3c4d:15::/64
+        protocol: ipv6
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_bluetooth_settings.py b/plugins/modules/devices_wireless_bluetooth_settings.py
index 49c532417..b4f9e5f01 100644
--- a/plugins/modules/devices_wireless_bluetooth_settings.py
+++ b/plugins/modules/devices_wireless_bluetooth_settings.py
@@ -5,24 +5,24 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_bluetooth_settings
-short_description: Resource module for devices _wireless _bluetooth _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _wireless _bluetooth _settings.
-- Update the bluetooth settings for a wireless device.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _wireless _bluetooth _settings.
+  - Update the bluetooth settings for a wireless device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_bluetooth_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_device_wireless_bluetooth_settings,
+  - Paths used are put /devices/{serial}/wireless/bluetooth/settings,
 options:
   major:
-    description: Desired major value of the beacon. If the value is set to null it will
-      reset to Dashboard's automatically generated value.
+    description: Desired major value of the beacon. If the value is set to null it
+      will reset to Dashboard's automatically generated value.
     type: int
   minor:
-    description: Desired minor value of the beacon. If the value is set to null it will
-      reset to Dashboard's automatically generated value.
+    description: Desired minor value of the beacon. If the value is set to null it
+      will reset to Dashboard's automatically generated value.
     type: int
   serial:
     description: Serial path parameter.
@@ -32,49 +32,44 @@
       to Dashboard's automatically generated value.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateDeviceWirelessBluetoothSettings
-  description: Complete reference of the updateDeviceWirelessBluetoothSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-bluetooth-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_device_wireless_bluetooth_settings,
-
-  - Paths used are
-    put /devices/{serial}/wireless/bluetooth/settings,
+  - description: Complete reference of the updateDeviceWirelessBluetoothSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-bluetooth-settings
+    name: Cisco Meraki documentation for wireless updateDeviceWirelessBluetoothSettings
+short_description: Resource module for devices _wireless _bluetooth _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_wireless_bluetooth_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     major: 13
     minor: 125
     serial: string
     uuid: 00000000-0000-0000-000-000000000000
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_bluetooth_settings_info.py b/plugins/modules/devices_wireless_bluetooth_settings_info.py
index 34e538774..e47d1f245 100644
--- a/plugins/modules/devices_wireless_bluetooth_settings_info.py
+++ b/plugins/modules/devices_wireless_bluetooth_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_bluetooth_settings_info
-short_description: Information module for devices _wireless _bluetooth _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _bluetooth _settings.
-- Return the bluetooth settings for a wireless device.
-version_added: '2.16.0'
+  - Get all devices _wireless _bluetooth _settings.
+  - Return the bluetooth settings for a wireless device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_bluetooth_settings_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_bluetooth_settings,
+  - Paths used are get /devices/{serial}/wireless/bluetooth/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessBluetoothSettings
-  description: Complete reference of the getDeviceWirelessBluetoothSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-bluetooth-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_bluetooth_settings,
-
-  - Paths used are
-    get /devices/{serial}/wireless/bluetooth/settings,
+  - description: Complete reference of the getDeviceWirelessBluetoothSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-bluetooth-settings
+    name: Cisco Meraki documentation for wireless getDeviceWirelessBluetoothSettings
+short_description: Information module for devices _wireless _bluetooth _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _bluetooth _settings
   cisco.meraki.devices_wireless_bluetooth_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_connection_stats_info.py b/plugins/modules/devices_wireless_connection_stats_info.py
index 18d3b331a..acb9a5fab 100644
--- a/plugins/modules/devices_wireless_connection_stats_info.py
+++ b/plugins/modules/devices_wireless_connection_stats_info.py
@@ -5,94 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_connection_stats_info
-short_description: Information module for devices _wireless _connection _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _connection _stats.
-- Aggregated connectivity info for a given AP on this network.
-version_added: '2.16.0'
+  - Get all devices _wireless _connection _stats.
+  - Aggregated connectivity info for a given AP on this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_connection_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_connection_stats,
+  - Paths used are get /devices/{serial}/wireless/connectionStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessConnectionStats
-  description: Complete reference of the getDeviceWirelessConnectionStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-connection-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_connection_stats,
-
-  - Paths used are
-    get /devices/{serial}/wireless/connectionStats,
+  - description: Complete reference of the getDeviceWirelessConnectionStats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-connection-stats
+    name: Cisco Meraki documentation for wireless getDeviceWirelessConnectionStats
+short_description: Information module for devices _wireless _connection _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _connection _stats
   cisco.meraki.devices_wireless_connection_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -102,7 +103,6 @@
     apTag: string
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_electronic_shelf_label.py b/plugins/modules/devices_wireless_electronic_shelf_label.py
index e26dfa992..5dc9e8918 100644
--- a/plugins/modules/devices_wireless_electronic_shelf_label.py
+++ b/plugins/modules/devices_wireless_electronic_shelf_label.py
@@ -5,20 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_electronic_shelf_label
-short_description: Resource module for devices _wireless _electronic _shelf _label
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _wireless _electronic _shelf _label.
-- Update the ESL settings of a device.
-version_added: '2.20.0'
+  - Manage operation update of the resource devices _wireless _electronic _shelf _label.
+  - Update the ESL settings of a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_electronic_shelf_label
+notes:
+  - SDK Method used are wireless.Wireless.update_device_wireless_electronic_shelf_label,
+  - Paths used are put /devices/{serial}/wireless/electronicShelfLabel,
 options:
   channel:
-    description: Desired ESL channel for the device, or 'Auto' (case insensitive) to
-      use the recommended channel.
+    description: Desired ESL channel for the device, or 'Auto' (case insensitive)
+      to use the recommended channel.
     type: str
   enabled:
     description: Turn ESL features on and off for this device.
@@ -27,48 +27,44 @@
     description: Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateDeviceWirelessElectronicShelfLabel
-  description: Complete reference of the updateDeviceWirelessElectronicShelfLabel API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-electronic-shelf-label
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_device_wireless_electronic_shelf_label,
-
-  - Paths used are
-    put /devices/{serial}/wireless/electronicShelfLabel,
+  - description: Complete reference of the updateDeviceWirelessElectronicShelfLabel
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-electronic-shelf-label
+    name: Cisco Meraki documentation for wireless updateDeviceWirelessElectronicShelfLabel
+short_description: Resource module for devices _wireless _electronic _shelf _label
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_wireless_electronic_shelf_label:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     channel: '1'
     enabled: true
     serial: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_electronic_shelf_label_info.py b/plugins/modules/devices_wireless_electronic_shelf_label_info.py
index 923f55e31..e64c3895e 100644
--- a/plugins/modules/devices_wireless_electronic_shelf_label_info.py
+++ b/plugins/modules/devices_wireless_electronic_shelf_label_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_electronic_shelf_label_info
-short_description: Information module for devices _wireless _electronic _shelf _label
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _electronic _shelf _label.
-- Return the ESL settings of a device.
-version_added: '2.20.0'
+  - Get all devices _wireless _electronic _shelf _label.
+  - Return the ESL settings of a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_electronic_shelf_label_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_electronic_shelf_label,
+  - Paths used are get /devices/{serial}/wireless/electronicShelfLabel,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessElectronicShelfLabel
-  description: Complete reference of the getDeviceWirelessElectronicShelfLabel API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-electronic-shelf-label
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_electronic_shelf_label,
-
-  - Paths used are
-    get /devices/{serial}/wireless/electronicShelfLabel,
+  - description: Complete reference of the getDeviceWirelessElectronicShelfLabel API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-electronic-shelf-label
+    name: Cisco Meraki documentation for wireless getDeviceWirelessElectronicShelfLabel
+short_description: Information module for devices _wireless _electronic _shelf _label
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _electronic _shelf _label
   cisco.meraki.devices_wireless_electronic_shelf_label_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_latency_stats_info.py b/plugins/modules/devices_wireless_latency_stats_info.py
index 2702ddd9f..cade3e223 100644
--- a/plugins/modules/devices_wireless_latency_stats_info.py
+++ b/plugins/modules/devices_wireless_latency_stats_info.py
@@ -5,101 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_latency_stats_info
-short_description: Information module for devices _wireless _latency _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _latency _stats.
-- Aggregated latency info for a given AP on this network.
-version_added: '2.16.0'
+  - Get all devices _wireless _latency _stats.
+  - Aggregated latency info for a given AP on this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_latency_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_latency_stats,
+  - Paths used are get /devices/{serial}/wireless/latencyStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
+  fields:
+    description:
+      - 'Fields query parameter. Partial selection If present, this call will return
+        only the selected fields of "rawDistribution", "avg". All fields will be returned
+        by default. Selected fields must be entered as a comma separated string.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
-  fields:
-    description:
-    - >
-      Fields query parameter. Partial selection If present, this call will return only the selected fields of
-      "rawDistribution", "avg". All fields will be returned by default. Selected fields must be entered as a comma
-      separated string.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessLatencyStats
-  description: Complete reference of the getDeviceWirelessLatencyStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-latency-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_latency_stats,
-
-  - Paths used are
-    get /devices/{serial}/wireless/latencyStats,
+  - description: Complete reference of the getDeviceWirelessLatencyStats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-latency-stats
+    name: Cisco Meraki documentation for wireless getDeviceWirelessLatencyStats
+short_description: Information module for devices _wireless _latency _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _latency _stats
   cisco.meraki.devices_wireless_latency_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -110,7 +112,6 @@
     fields: string
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_radio_settings.py b/plugins/modules/devices_wireless_radio_settings.py
index 7750ca760..83fb37f30 100644
--- a/plugins/modules/devices_wireless_radio_settings.py
+++ b/plugins/modules/devices_wireless_radio_settings.py
@@ -5,29 +5,29 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_radio_settings
-short_description: Resource module for devices _wireless _radio _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource devices _wireless _radio _settings.
-- Update the radio settings of a device.
-version_added: '2.16.0'
+  - Manage operation update of the resource devices _wireless _radio _settings.
+  - Update the radio settings of a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_radio_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_device_wireless_radio_settings,
+  - Paths used are put /devices/{serial}/wireless/radio/settings,
 options:
   fiveGhzSettings:
     description: Manual radio settings for 5 GHz.
     suboptions:
       channel:
         description: Sets a manual channel for 5 GHz. Can be '36', '40', '44', '48',
-          '52', '56', '60', '64', '100', '104', '108', '112', '116', '120', '124', '128',
-          '132', '136', '140', '144', '149', '153', '157', '161', '165', '169', '173'
-          or '177' or null for using auto channel.
+          '52', '56', '60', '64', '100', '104', '108', '112', '116', '120', '124',
+          '128', '132', '136', '140', '144', '149', '153', '157', '161', '165', '169',
+          '173' or '177' or null for using auto channel.
         type: int
       channelWidth:
-        description: Sets a manual channel for 5 GHz. Can be '0', '20', '40', '80' or
-          '160' or null for using auto channel width.
+        description: Sets a manual channel for 5 GHz. Can be '0', '20', '40', '80'
+          or '160' or null for using auto channel width.
         type: int
       targetPower:
         description: Set a manual target power for 5 GHz (dBm). Enter null for using
@@ -35,10 +35,10 @@
         type: int
     type: dict
   rfProfileId:
-    description: The ID of an RF profile to assign to the device. If the value of this
-      parameter is null, the appropriate basic RF profile (indoor or outdoor) will be
-      assigned to the device. Assigning an RF profile will clear ALL manually configured
-      overrides on the device (channel width, channel, power).
+    description: The ID of an RF profile to assign to the device. If the value of
+      this parameter is null, the appropriate basic RF profile (indoor or outdoor)
+      will be assigned to the device. Assigning an RF profile will clear ALL manually
+      configured overrides on the device (channel width, channel, power).
     type: str
   serial:
     description: Serial path parameter.
@@ -47,9 +47,9 @@
     description: Manual radio settings for 2.4 GHz.
     suboptions:
       channel:
-        description: Sets a manual channel for 2.4 GHz. Can be '1', '2', '3', '4', '5',
-          '6', '7', '8', '9', '10', '11', '12', '13' or '14' or null for using auto
-          channel.
+        description: Sets a manual channel for 2.4 GHz. Can be '1', '2', '3', '4',
+          '5', '6', '7', '8', '9', '10', '11', '12', '13' or '14' or null for using
+          auto channel.
         type: int
       targetPower:
         description: Set a manual target power for 2.4 GHz (dBm). Enter null for using
@@ -57,43 +57,39 @@
         type: int
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateDeviceWirelessRadioSettings
-  description: Complete reference of the updateDeviceWirelessRadioSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-radio-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_device_wireless_radio_settings,
-
-  - Paths used are
-    put /devices/{serial}/wireless/radio/settings,
+  - description: Complete reference of the updateDeviceWirelessRadioSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-device-wireless-radio-settings
+    name: Cisco Meraki documentation for wireless updateDeviceWirelessRadioSettings
+short_description: Resource module for devices _wireless _radio _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.devices_wireless_radio_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     fiveGhzSettings:
       channel: 149
@@ -104,7 +100,6 @@
     twoFourGhzSettings:
       channel: 11
       targetPower: 21
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_radio_settings_info.py b/plugins/modules/devices_wireless_radio_settings_info.py
index 0cbeb278b..8541f36dd 100644
--- a/plugins/modules/devices_wireless_radio_settings_info.py
+++ b/plugins/modules/devices_wireless_radio_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_radio_settings_info
-short_description: Information module for devices _wireless _radio _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _radio _settings.
-- Return the radio settings of a device.
-version_added: '2.16.0'
+  - Get all devices _wireless _radio _settings.
+  - Return the radio settings of a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_radio_settings_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_radio_settings,
+  - Paths used are get /devices/{serial}/wireless/radio/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessRadioSettings
-  description: Complete reference of the getDeviceWirelessRadioSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-radio-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_radio_settings,
-
-  - Paths used are
-    get /devices/{serial}/wireless/radio/settings,
+  - description: Complete reference of the getDeviceWirelessRadioSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-radio-settings
+    name: Cisco Meraki documentation for wireless getDeviceWirelessRadioSettings
+short_description: Information module for devices _wireless _radio _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _radio _settings
   cisco.meraki.devices_wireless_radio_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/devices_wireless_status_info.py b/plugins/modules/devices_wireless_status_info.py
index d4c67f4ad..fc06e4e8f 100644
--- a/plugins/modules/devices_wireless_status_info.py
+++ b/plugins/modules/devices_wireless_status_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: devices_wireless_status_info
-short_description: Information module for devices _wireless _status
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all devices _wireless _status.
-- Return the SSID statuses of an access point.
-version_added: '2.16.0'
+  - Get all devices _wireless _status.
+  - Return the SSID statuses of an access point.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: devices_wireless_status_info
+notes:
+  - SDK Method used are wireless.Wireless.get_device_wireless_status,
+  - Paths used are get /devices/{serial}/wireless/status,
 options:
   headers:
     description: Additional headers.
     type: dict
   serial:
     description:
-    - Serial path parameter.
+      - Serial path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getDeviceWirelessStatus
-  description: Complete reference of the getDeviceWirelessStatus API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-status
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_device_wireless_status,
-
-  - Paths used are
-    get /devices/{serial}/wireless/status,
+  - description: Complete reference of the getDeviceWirelessStatus API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-device-wireless-status
+    name: Cisco Meraki documentation for wireless getDeviceWirelessStatus
+short_description: Information module for devices _wireless _status
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all devices _wireless _status
   cisco.meraki.devices_wireless_status_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/meraki_action_batch.py b/plugins/modules/meraki_action_batch.py
index 8c7b47a14..ab8a2caa9 100644
--- a/plugins/modules/meraki_action_batch.py
+++ b/plugins/modules/meraki_action_batch.py
@@ -15,152 +15,148 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_action_batch
-short_description: Manage Action Batch jobs within the Meraki Dashboard.
-description:
-- Allows for management of Action Batch jobs for Meraki.
-notes:
-- This module is in active development and the interface may change.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.organizations_action_batches
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for management of Action Batch jobs for Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_action_batch
+notes:
+  - This module is in active development and the interface may change.
 options:
-  state:
-    description:
-    - Specifies whether to lookup, create, or delete an Action Batch job.
-    choices: ['query', 'present', 'absent']
-    default: present
-    type: str
-  net_name:
-    description:
-    - Name of network, if applicable.
-    type: str
-  net_id:
-      description:
-      - ID of network, if applicable.
-      type: str
   action_batch_id:
     description:
-    - ID of an existing Action Batch job.
+      - ID of an existing Action Batch job.
     type: str
-  confirmed:
-    description:
-    - Whether job is to be executed.
-    type: bool
-    default: False
-  synchronous:
-    description:
-    - Whether job is a synchronous or asynchronous job.
-    type: bool
-    default: True
   actions:
     description:
-    - List of actions the job should execute.
-    type: list
+      - List of actions the job should execute.
     elements: dict
     suboptions:
+      body:
+        description:
+          - Required body of action.
+        type: raw
       operation:
+        choices:
+          - create
+          - destroy
+          - update
+          - claim
+          - bind
+          - split
+          - unbind
+          - combine
+          - update_order
+          - cycle
+          - swap
+          - assignSeats
+          - move
+          - moveSeats
+          - renewSeats
         description:
-        - Operation type of action
+          - Operation type of action
         type: str
-        choices: [
-            'create',
-            'destroy',
-            'update',
-            'claim',
-            'bind',
-            'split',
-            'unbind',
-            'combine',
-            'update_order',
-            'cycle',
-            'swap',
-            'assignSeats',
-            'move',
-            'moveSeats',
-            'renewSeats'
-        ]
       resource:
         description:
-        - Path to Action Batch resource.
+          - Path to Action Batch resource.
         type: str
-      body:
-        description:
-        - Required body of action.
-        type: raw
-author:
-- Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  confirmed:
+    default: false
+    description:
+      - Whether job is to be executed.
+    type: bool
+  net_id:
+    description:
+      - ID of network, if applicable.
+    type: str
+  net_name:
+    description:
+      - Name of network, if applicable.
+    type: str
+  state:
+    choices:
+      - query
+      - present
+      - absent
+    default: present
+    description:
+      - Specifies whether to lookup, create, or delete an Action Batch job.
+    type: str
+  synchronous:
+    default: true
+    description:
+      - Whether job is a synchronous or asynchronous job.
+    type: bool
+short_description: Manage Action Batch jobs within the Meraki Dashboard.
 """
 
 
 EXAMPLES = r"""
-  - name: Query all Action Batches
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: query
-    delegate_to: localhost
-
-  - name: Query one Action Batch job
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: query
-      action_batch_id: 12345
-    delegate_to: localhost
-
-  - name: Create an Action Batch job
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: present
-      actions:
-      - resource: '/organizations/org_123/networks'
-        operation: 'create'
+- name: Query all Action Batches
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: query
+  delegate_to: localhost
+- name: Query one Action Batch job
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: query
+    action_batch_id: 12345
+  delegate_to: localhost
+- name: Create an Action Batch job
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: present
+    actions:
+      - resource: /organizations/org_123/networks
+        operation: create
         body:
-          name: 'AnsibleActionBatch1'
+          name: AnsibleActionBatch1
           productTypes:
-            - 'switch'
-    delegate_to: localhost
-
-  - name: Update Action Batch job
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: present
-      action_batch_id: 12345
-      synchronous: false
-
-  - name: Create an Action Batch job with multiple actions
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: present
-      actions:
-      - resource: '/organizations/org_123/networks'
-        operation: 'create'
+            - switch
+  delegate_to: localhost
+- name: Update Action Batch job
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: present
+    action_batch_id: 12345
+    synchronous: false
+- name: Create an Action Batch job with multiple actions
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: present
+    actions:
+      - resource: /organizations/org_123/networks
+        operation: create
         body:
-          name: 'AnsibleActionBatch2'
+          name: AnsibleActionBatch2
           productTypes:
-            - 'switch'
-      - resource: '/organizations/org_123/networks'
-        operation: 'create'
+            - switch
+      - resource: /organizations/org_123/networks
+        operation: create
         body:
-          name: 'AnsibleActionBatch3'
+          name: AnsibleActionBatch3
           productTypes:
-            - 'switch'
-    delegate_to: localhost
-
-  - name: Delete an Action Batch job
-    meraki_action_batch:
-      auth_key: abc123
-      org_name: YourOrg
-      state: absent
-      action_batch_id: 12345
-    delegate_to: localhost
+            - switch
+  delegate_to: localhost
+- name: Delete an Action Batch job
+  meraki_action_batch:
+    auth_key: abc123
+    org_name: YourOrg
+    state: absent
+    action_batch_id: 12345
+  delegate_to: localhost
 """
 
 RETURN = r"""
diff --git a/plugins/modules/meraki_admin.py b/plugins/modules/meraki_admin.py
index 47c6d18da..1818b2bc0 100644
--- a/plugins/modules/meraki_admin.py
+++ b/plugins/modules/meraki_admin.py
@@ -162,10 +162,10 @@
     orgAccess: read-only
     email: jane@doe.com
     tags:
-        - tag: tenant
-          access: full
-        - tag: corporate
-          access: read-only
+      - tag: tenant
+        access: full
+      - tag: corporate
+        access: read-only
 
 - name: Create a new administrator with full access to a network
   meraki_admin:
@@ -176,8 +176,8 @@
     orgAccess: read-only
     email: jane@doe.com
     networks:
-        - id: N_12345
-          access: full
+      - id: N_12345
+        access: full
 '''
 
 RETURN = r'''
diff --git a/plugins/modules/meraki_alert.py b/plugins/modules/meraki_alert.py
index 8b9031b2d..673d111ef 100644
--- a/plugins/modules/meraki_alert.py
+++ b/plugins/modules/meraki_alert.py
@@ -15,102 +15,107 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_alert
-version_added: "2.1.0"
-short_description: Manage alerts in the Meraki cloud
-description:
-- Allows for creation, management, and visibility into alert settings within Meraki.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_alerts_settings
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for creation, management, and visibility into alert settings within Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_alert
 options:
-    state:
+  alerts:
+    description:
+      - Alert-specific configuration for each type.
+    elements: dict
+    suboptions:
+      alert_destinations:
         description:
-        - Create or modify an alert.
-        choices: [ present, query ]
-        default: present
-        type: str
-    net_name:
+          - A hash of destinations for this specific alert.
+        suboptions:
+          all_admins:
+            description:
+              - If true, all network admins will receive emails.
+            type: bool
+          emails:
+            description:
+              - A list of emails that will recieve the alert(s).
+            elements: str
+            type: list
+          http_server_ids:
+            description:
+              - A list of HTTP server IDs to send a Webhook to.
+            elements: str
+            type: list
+          snmp:
+            description:
+              - If true, then an SNMP trap will be sent if there is an SNMP trap server
+                configured for this network.
+            type: bool
+        type: dict
+      alert_type:
         description:
-        - Name of a network.
-        aliases: [ name, network ]
+          - The type of alert.
         type: str
-    net_id:
+      enabled:
         description:
-        - ID number of a network.
-        type: str
-    default_destinations:
+          - A boolean depicting if the alert is turned on or off.
+        type: bool
+      filters:
+        default: {}
         description:
-        - Properties for destinations when alert specific destinations aren't specified.
-        type: dict
-        suboptions:
-            all_admins:
-                description:
-                - If true, all network admins will receive emails.
-                type: bool
-            snmp:
-                description:
-                - If true, then an SNMP trap will be sent if there is an SNMP trap server configured for this network.
-                type: bool
-            emails:
-                description:
-                - A list of emails that will recieve the alert(s).
-                type: list
-                elements: str
-            http_server_ids:
-                description:
-                - A list of HTTP server IDs to send a Webhook to.
-                type: list
-                elements: str
-    alerts:
+          - A hash of specific configuration data for the alert. Only filters specific
+            to the alert will be updated.
+          - No validation checks occur against C(filters).
+        type: raw
+    type: list
+  default_destinations:
+    description:
+      - Properties for destinations when alert specific destinations aren't specified.
+    suboptions:
+      all_admins:
         description:
-        - Alert-specific configuration for each type.
+          - If true, all network admins will receive emails.
+        type: bool
+      emails:
+        description:
+          - A list of emails that will recieve the alert(s).
+        elements: str
         type: list
-        elements: dict
-        suboptions:
-            alert_type:
-                description:
-                - The type of alert.
-                type: str
-            enabled:
-                description:
-                - A boolean depicting if the alert is turned on or off.
-                type: bool
-            filters:
-                description:
-                - A hash of specific configuration data for the alert. Only filters specific to the alert will be updated.
-                - No validation checks occur against C(filters).
-                type: raw
-                default: {}
-            alert_destinations:
-                description:
-                - A hash of destinations for this specific alert.
-                type: dict
-                suboptions:
-                    all_admins:
-                        description:
-                        - If true, all network admins will receive emails.
-                        type: bool
-                    snmp:
-                        description:
-                        - If true, then an SNMP trap will be sent if there is an SNMP trap server configured for this network.
-                        type: bool
-                    emails:
-                        description:
-                        - A list of emails that will recieve the alert(s).
-                        type: list
-                        elements: str
-                    http_server_ids:
-                        description:
-                        - A list of HTTP server IDs to send a Webhook to.
-                        type: list
-                        elements: str
-
-author:
-    - Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+      http_server_ids:
+        description:
+          - A list of HTTP server IDs to send a Webhook to.
+        elements: str
+        type: list
+      snmp:
+        description:
+          - If true, then an SNMP trap will be sent if there is an SNMP trap server
+            configured for this network.
+        type: bool
+    type: dict
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    aliases:
+      - name
+      - network
+    description:
+      - Name of a network.
+    type: str
+  state:
+    choices:
+      - present
+      - query
+    default: present
+    description:
+      - Create or modify an alert.
+    type: str
+short_description: Manage alerts in the Meraki cloud
+version_added: 2.1.0
 """
 
 EXAMPLES = r"""
@@ -122,33 +127,32 @@
     state: present
     default_destinations:
       emails:
-      - 'youremail@yourcorp'
-      - 'youremail2@yourcorp'
-      all_admins: yes
-      snmp: no
+        - youremail@yourcorp
+        - youremail2@yourcorp
+      all_admins: true
+      snmp: false
     alerts:
-      - alert_type: "gatewayDown"
-        enabled: yes
+      - alert_type: gatewayDown
+        enabled: true
         filters:
           timeout: 60
         alert_destinations:
           emails:
-          - 'youremail@yourcorp'
-          - 'youremail2@yourcorp'
-          all_admins: yes
-          snmp: no
-      - alert_type: "usageAlert"
-        enabled: yes
+            - youremail@yourcorp
+            - youremail2@yourcorp
+          all_admins: true
+          snmp: false
+      - alert_type: usageAlert
+        enabled: true
         filters:
           period: 1200
           threshold: 104857600
         alert_destinations:
           emails:
-          - 'youremail@yourcorp'
-          - 'youremail2@yourcorp'
-          all_admins: yes
-          snmp: no
-
+            - youremail@yourcorp
+            - youremail2@yourcorp
+          all_admins: true
+          snmp: false
 - name: Query all settings
   meraki_alert:
     auth_key: abc123
diff --git a/plugins/modules/meraki_device.py b/plugins/modules/meraki_device.py
index 8da204992..15664d073 100644
--- a/plugins/modules/meraki_device.py
+++ b/plugins/modules/meraki_device.py
@@ -171,7 +171,7 @@
     org_name: YourOrg
     net_name: YourNet
     state: present
-    serial: '{{serial}}'
+    serial: '{{ serial }}'
     name: mr26
     address: 1060 W. Addison St., Chicago, IL
     lat: 41.948038
diff --git a/plugins/modules/meraki_firewalled_services.py b/plugins/modules/meraki_firewalled_services.py
index 021da2bb5..13a3d0634 100644
--- a/plugins/modules/meraki_firewalled_services.py
+++ b/plugins/modules/meraki_firewalled_services.py
@@ -79,7 +79,7 @@
   meraki_firewalled_services:
     auth_key: '{{ auth_key }}'
     state: present
-    org_name: '{{test_org_name}}'
+    org_name: '{{ test_org_name }}'
     net_name: IntTestNetworkAppliance
     service: ICMP
     access: blocked
diff --git a/plugins/modules/meraki_management_interface.py b/plugins/modules/meraki_management_interface.py
index 17b164208..4918bd8e1 100644
--- a/plugins/modules/meraki_management_interface.py
+++ b/plugins/modules/meraki_management_interface.py
@@ -153,7 +153,7 @@
     serial: AAAA-BBBB-CCCC
     wan2:
       wan_enabled: enabled
-      using_static_ip: yes
+      using_static_ip: true
       static_ip: 192.168.16.195
       static_gateway_ip: 192.168.16.1
       static_subnet_mask: 255.255.255.0
@@ -192,7 +192,7 @@
                 description: Boolean value of whether static IP assignment is used on interface
                 returned: success
                 type: bool
-                sample: True
+                sample: true
             static_ip:
                 description: Assigned static IP
                 returned: only if static IP assignment is used
@@ -232,7 +232,7 @@
                 description: Boolean value of whether static IP assignment is used on interface
                 returned: success
                 type: bool
-                sample: True
+                sample: true
             static_ip:
                 description: Assigned static IP
                 returned: only if static IP assignment is used
diff --git a/plugins/modules/meraki_mr_l3_firewall.py b/plugins/modules/meraki_mr_l3_firewall.py
index 85d9f9334..fb076a7e4 100644
--- a/plugins/modules/meraki_mr_l3_firewall.py
+++ b/plugins/modules/meraki_mr_l3_firewall.py
@@ -53,7 +53,7 @@
         description:
         - Sets whether devices can talk to other devices on the same LAN.
         type: bool
-        default: yes
+        default: true
     rules:
         description:
         - List of firewall rules.
@@ -101,7 +101,7 @@
         protocol: tcp
         dest_port: 80
         dest_cidr: 192.0.2.0/24
-    allow_lan_access: no
+    allow_lan_access: false
   delegate_to: localhost
 
 - name: Enable local LAN access
@@ -112,7 +112,7 @@
     net_id: 123
     number: 1
     rules:
-    allow_lan_access: yes
+    allow_lan_access: true
   delegate_to: localhost
 
 - name: Query firewall rules
diff --git a/plugins/modules/meraki_mr_l7_firewall.py b/plugins/modules/meraki_mr_l7_firewall.py
index 8300dd362..cdee26360 100644
--- a/plugins/modules/meraki_mr_l7_firewall.py
+++ b/plugins/modules/meraki_mr_l7_firewall.py
@@ -15,96 +15,104 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mr_l7_firewall
-short_description: Manage MR access point layer 7 firewalls in the Meraki cloud
-description:
-- Allows for creation, management, and visibility into layer 7 firewalls implemented on Meraki MR access points.
-- Module assumes a complete list of firewall rules are passed as a parameter.
-- If there is interest in this module allowing manipulation of a single firewall rule, please submit an issue against this module.
+author:
+  - Joshua Coronado (@joshuajcoronado)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_appliance_firewall_l7_firewall_rules
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for creation, management, and visibility into layer 7 firewalls implemented
+    on Meraki MR access points.
+  - Module assumes a complete list of firewall rules are passed as a parameter.
+  - If there is interest in this module allowing manipulation of a single firewall
+    rule, please submit an issue against this module.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mr_l7_firewall
 options:
-    state:
+  categories:
+    description:
+      - When C(True), specifies that applications and application categories should
+        be queried instead of firewall rules.
+    type: bool
+  net_id:
+    description:
+      - ID of network containing access points.
+    type: str
+  net_name:
+    description:
+      - Name of network containing access points.
+    type: str
+  number:
+    aliases:
+      - ssid_number
+    description:
+      - Number of SSID to apply firewall rule to.
+    type: str
+  rules:
+    description:
+      - List of layer 7 firewall rules.
+    elements: dict
+    suboptions:
+      application:
         description:
-        - Query or modify a firewall rule.
-        choices: ['present', 'query']
-        default: present
-        type: str
-    net_name:
+          - Application to filter.
+        suboptions:
+          id:
+            description:
+              - URI of application as defined by Meraki.
+            type: str
+          name:
+            description:
+              - Name of application to filter as defined by Meraki.
+            type: str
+        type: dict
+      host:
         description:
-        - Name of network containing access points.
+          - FQDN of host to filter.
         type: str
-    net_id:
+      ip_range:
         description:
-        - ID of network containing access points.
+          - CIDR notation range of IP addresses to apply rule to.
+          - Port can be appended to range with a C(":").
         type: str
-    number:
+      policy:
+        choices:
+          - deny
+        default: deny
         description:
-        - Number of SSID to apply firewall rule to.
+          - Policy to apply if rule is hit.
         type: str
-        aliases: [ ssid_number ]
-    ssid_name:
+      port:
         description:
-        - Name of SSID to apply firewall rule to.
+          - TCP or UDP based port to filter.
         type: str
-        aliases: [ ssid ]
-    rules:
+      type:
+        choices:
+          - application
+          - application_category
+          - host
+          - ip_range
+          - port
         description:
-        - List of layer 7 firewall rules.
-        type: list
-        elements: dict
-        suboptions:
-            policy:
-                description:
-                - Policy to apply if rule is hit.
-                choices: [deny]
-                default: deny
-                type: str
-            type:
-                description:
-                - Type of policy to apply.
-                choices: [application,
-                          application_category,
-                          host,
-                          ip_range,
-                          port]
-                type: str
-            application:
-                description:
-                - Application to filter.
-                type: dict
-                suboptions:
-                    name:
-                        description:
-                        - Name of application to filter as defined by Meraki.
-                        type: str
-                    id:
-                        description:
-                        - URI of application as defined by Meraki.
-                        type: str
-            host:
-                description:
-                - FQDN of host to filter.
-                type: str
-            ip_range:
-                description:
-                - CIDR notation range of IP addresses to apply rule to.
-                - Port can be appended to range with a C(":").
-                type: str
-            port:
-                description:
-                - TCP or UDP based port to filter.
-                type: str
-    categories:
-        description:
-        - When C(True), specifies that applications and application categories should be queried instead of firewall rules.
-        type: bool
-author:
-- Joshua Coronado (@joshuajcoronado)
-extends_documentation_fragment: cisco.meraki.meraki
+          - Type of policy to apply.
+        type: str
+    type: list
+  ssid_name:
+    aliases:
+      - ssid
+    description:
+      - Name of SSID to apply firewall rule to.
+    type: str
+  state:
+    choices:
+      - present
+      - query
+    default: present
+    description:
+      - Query or modify a firewall rule.
+    type: str
+short_description: Manage MR access point layer 7 firewalls in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -116,17 +124,15 @@
     state: query
     number: 1
   delegate_to: localhost
-
 - name: Query applications and application categories
   meraki_mr_l7_firewall:
     auth_key: abc123
     org_name: YourOrg
     net_name: YourNet
     number: 1
-    categories: yes
+    categories: true
     state: query
   delegate_to: localhost
-
 - name: Set firewall rules
   meraki_mr_l7_firewall:
     auth_key: abc123
diff --git a/plugins/modules/meraki_mr_radio.py b/plugins/modules/meraki_mr_radio.py
index d3a55ca41..3ef7ac859 100644
--- a/plugins/modules/meraki_mr_radio.py
+++ b/plugins/modules/meraki_mr_radio.py
@@ -15,131 +15,136 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mr_radio
-short_description: Manage device radio settings for Meraki wireless networks
-description:
-- Allows for configuration of radio settings in Meraki MR wireless networks.
+author:
+  - Tyler Christiansen (@supertylerc)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.devices_wireless_radio_settings
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for configuration of radio settings in Meraki MR wireless networks.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mr_radio
 options:
-  state:
+  five_ghz_settings:
+    default: {}
     description:
-    - Query or edit radio settings on a device.
+      - Manual radio settings for 5 GHz.
+    suboptions:
+      channel:
+        choices:
+          - 36
+          - 40
+          - 44
+          - 48
+          - 52
+          - 56
+          - 60
+          - 64
+          - 100
+          - 104
+          - 108
+          - 112
+          - 116
+          - 120
+          - 124
+          - 128
+          - 132
+          - 136
+          - 140
+          - 144
+          - 149
+          - 153
+          - 157
+          - 161
+          - 165
+        description:
+          - Sets a manual channel for 5 GHz.
+        type: int
+      channel_width:
+        choices:
+          - auto
+          - '20'
+          - '40'
+          - '80'
+        description:
+          - Sets a manual channel for 5 GHz.
+          - Can be '0', '20', '40', or '80' or null for using auto channel width.
+        type: str
+      target_power:
+        description:
+          - Set a manual target power for 5 GHz.
+          - Can be between '8' or '30' or null for using auto power range.
+        type: int
+    type: dict
+  net_id:
+    description:
+      - ID of a network.
     type: str
-    choices: [present, query]
-    default: present
-  serial:
+  net_name:
+    aliases:
+      - network
     description:
-    - Serial number of a device to query.
+      - Name of a network.
     type: str
   rf_profile_id:
     description:
-    - The ID of an RF profile to assign to the device.
-    - If the value of this parameter is null, the appropriate basic RF profile (indoor or outdoor) will be assigned to the device.
-    - Assigning an RF profile will clear ALL manually configured overrides on the device (channel width, channel, power).
+      - The ID of an RF profile to assign to the device.
+      - If the value of this parameter is null, the appropriate basic RF profile (indoor
+        or outdoor) will be assigned to the device.
+      - Assigning an RF profile will clear ALL manually configured overrides on the
+        device (channel width, channel, power).
     type: str
   rf_profile_name:
     description:
-    - The name of an RF profile to assign to the device.
-    - Similar to ``rf_profile_id``, but requires ``net_id`` (preferred) or ``net_name``.
+      - The name of an RF profile to assign to the device.
+      - Similar to ``rf_profile_id``, but requires ``net_id`` (preferred) or ``net_name``.
     type: str
-  net_name:
+  serial:
     description:
-    - Name of a network.
-    aliases: [network]
+      - Serial number of a device to query.
     type: str
-  net_id:
+  state:
+    choices:
+      - present
+      - query
+    default: present
     description:
-    - ID of a network.
+      - Query or edit radio settings on a device.
     type: str
-  five_ghz_settings:
-    description:
-    - Manual radio settings for 5 GHz.
-    type: dict
+  two_four_ghz_settings:
     default: {}
+    description:
+      - Manual radio settings for 2.4 GHz.
     suboptions:
-      target_power:
-        description:
-        - Set a manual target power for 5 GHz.
-        - Can be between '8' or '30' or null for using auto power range.
-        type: int
-      channel_width:
-        description:
-        - Sets a manual channel for 5 GHz.
-        - Can be '0', '20', '40', or '80' or null for using auto channel width.
-        choices:
-        - auto
-        - '20'
-        - '40'
-        - '80'
-        type: str
       channel:
-        description:
-        - Sets a manual channel for 5 GHz.
-        type: int
         choices:
-        - 36
-        - 40
-        - 44
-        - 48
-        - 52
-        - 56
-        - 60
-        - 64
-        - 100
-        - 104
-        - 108
-        - 112
-        - 116
-        - 120
-        - 124
-        - 128
-        - 132
-        - 136
-        - 140
-        - 144
-        - 149
-        - 153
-        - 157
-        - 161
-        - 165
-  two_four_ghz_settings:
-    description:
-    - Manual radio settings for 2.4 GHz.
-    type: dict
-    default: {}
-    suboptions:
-      target_power:
+          - 1
+          - 2
+          - 3
+          - 4
+          - 5
+          - 6
+          - 7
+          - 8
+          - 9
+          - 10
+          - 11
+          - 12
+          - 13
+          - 14
         description:
-        - Set a manual target power for 2.4 GHz.
-        - Can be between '5' or '30' or null for using auto power range.
+          - Sets a manual channel for 2.4 GHz.
+          - Can be '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12',
+            '13' or '14' or null for using auto channel.
         type: int
-      channel:
+      target_power:
         description:
-        - Sets a manual channel for 2.4 GHz.
-        - Can be '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13' or '14' or null for using auto channel.
-        choices:
-        - 1
-        - 2
-        - 3
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
-        - 14
+          - Set a manual target power for 2.4 GHz.
+          - Can be between '5' or '30' or null for using auto power range.
         type: int
-author:
-- Tyler Christiansen (@supertylerc)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: dict
+short_description: Manage device radio settings for Meraki wireless networks
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/meraki_mr_rf_profile.py b/plugins/modules/meraki_mr_rf_profile.py
index 13db54c28..85674aa73 100644
--- a/plugins/modules/meraki_mr_rf_profile.py
+++ b/plugins/modules/meraki_mr_rf_profile.py
@@ -189,10 +189,10 @@
     state: present
     name: Test Profile
     band_selection_type: ap
-    client_balancing_enabled: True
+    client_balancing_enabled: true
     ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
+      mode: dual
+      band_steering_enabled: true
     five_ghz_settings:
       max_power: 10
       min_bitrate: 12
@@ -238,10 +238,10 @@
     state: present
     profile_id: 12345
     band_selection_type: ap
-    client_balancing_enabled: True
+    client_balancing_enabled: true
     ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
+      mode: dual
+      band_steering_enabled: true
     five_ghz_settings:
       max_power: 10
       min_bitrate: 12
diff --git a/plugins/modules/meraki_mr_settings.py b/plugins/modules/meraki_mr_settings.py
index e6bc25ae9..8e5f17b3b 100644
--- a/plugins/modules/meraki_mr_settings.py
+++ b/plugins/modules/meraki_mr_settings.py
@@ -106,24 +106,24 @@
             - If enabled, SSIDs must also be configured to use bridge mode.
             type: bool
             returned: success
-            sample: True
+            sample: true
         led_lights_on:
             description:
             - Toggle for enabling or disabling LED lights on all APs in the network.
             type: bool
             returned: success
-            sample: True
+            sample: true
         location_analytics_enabled:
             description:
             - Toggle for enabling or disabling location analytics for your network.
             type: bool
             returned: success
-            sample: True
+            sample: true
         meshing_enabled:
             description: Toggle for enabling or disabling meshing in a network.
             type: bool
             returned: success
-            sample: True
+            sample: true
 '''
 
 from ansible.module_utils.basic import AnsibleModule, json
diff --git a/plugins/modules/meraki_mr_ssid.py b/plugins/modules/meraki_mr_ssid.py
index 90ba50f09..a9c37abb4 100644
--- a/plugins/modules/meraki_mr_ssid.py
+++ b/plugins/modules/meraki_mr_ssid.py
@@ -15,249 +15,290 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mr_ssid
-short_description: Manage wireless SSIDs in the Meraki cloud
-description:
-- Allows for management of SSIDs in a Meraki wireless environment.
-notes:
-- Deleting an SSID does not delete RADIUS servers.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_wireless_ssids
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for management of SSIDs in a Meraki wireless environment.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mr_ssid
+notes:
+  - Deleting an SSID does not delete RADIUS servers.
 options:
-    state:
-        description:
-        - Specifies whether SNMP information should be queried or modified.
-        type: str
-        choices: [ absent, query, present ]
-        default: present
-    number:
-        description:
-        - SSID number within network.
-        type: int
-        aliases: [ssid_number]
-    name:
-        description:
-        - Name of SSID.
-        type: str
-    net_name:
-        description:
-        - Name of network.
-        type: str
-    net_id:
-        description:
-        - ID of network.
-        type: str
-    enabled:
-        description:
-        - Enable or disable SSID network.
-        type: bool
-    auth_mode:
-        description:
-        - Set authentication mode of network.
-        type: str
-        choices: [open, psk, open-with-radius, 8021x-meraki, 8021x-radius]
-    encryption_mode:
-        description:
-        - Set encryption mode of network.
-        type: str
-        choices: [wpa, eap, wpa-eap]
-    psk:
-        description:
-        - Password for wireless network.
-        - Requires auth_mode to be set to psk.
-        type: str
-    wpa_encryption_mode:
-        description:
-        - Encryption mode within WPA specification.
-        type: str
-        choices: [WPA1 and WPA2, WPA2 only, WPA3 Transition Mode, WPA3 only]
-    splash_page:
-        description:
-        - Set to enable splash page and specify type of splash.
-        type: str
-        choices: ['None',
-                  'Click-through splash page',
-                  'Billing',
-                  'Password-protected with Meraki RADIUS',
-                  'Password-protected with custom RADIUS',
-                  'Password-protected with Active Directory',
-                  'Password-protected with LDAP',
-                  'SMS authentication',
-                  'Systems Manager Sentry',
-                  'Facebook Wi-Fi',
-                  'Google OAuth',
-                  'Sponsored guest',
-                  'Cisco ISE']
-    radius_servers:
-        description:
-        - List of RADIUS servers.
-        type: list
-        elements: dict
-        suboptions:
-            host:
-                description:
-                - IP address or hostname of RADIUS server.
-                type: str
-                required: true
-            port:
-                description:
-                - Port number RADIUS server is listening to.
-                type: int
-            secret:
-                description:
-                - RADIUS password.
-                - Setting password is not idempotent.
-                type: str
-    radius_proxy_enabled:
-        description:
-        - Enable or disable RADIUS Proxy on SSID.
-        type: bool
-    radius_coa_enabled:
-        description:
-        - Enable or disable RADIUS CoA (Change of Authorization) on SSID.
-        type: bool
-    radius_failover_policy:
-        description:
-        - Set client access policy in case RADIUS servers aren't available.
-        type: str
-        choices: [Deny access, Allow access]
-    radius_load_balancing_policy:
-        description:
-        - Set load balancing policy when multiple RADIUS servers are specified.
-        type: str
-        choices: [Strict priority order, Round robin]
-    radius_accounting_enabled:
-        description:
-        - Enable or disable RADIUS accounting.
-        type: bool
-    radius_accounting_servers:
-        description:
-        - List of RADIUS servers for RADIUS accounting.
+  ap_availability_tags:
+    description:
+      - Set whether SSID will be broadcast by APs with tags matching any of the tags
+        in this list.
+      - Requires C(available_on_all_aps) to be C(false).
+    elements: str
+    type: list
+  ap_tags_vlan_ids:
+    description:
+      - List of VLAN tags.
+      - Requires C(ip_assignment_mode) to be C(Bridge mode) or C(Layer 3 roaming).
+      - Requires C(use_vlan_tagging) to be C(True).
+    elements: dict
+    suboptions:
+      tags:
+        description:
+          - List of AP tags.
+        elements: str
         type: list
-        elements: dict
-        suboptions:
-            host:
-                description:
-                - IP address or hostname of RADIUS server.
-                type: str
-                required: true
-            port:
-                description:
-                - Port number RADIUS server is listening to.
-                type: int
-            secret:
-                description:
-                - RADIUS password.
-                - Setting password is not idempotent.
-                type: str
-    ip_assignment_mode:
-        description:
-        - Method of which SSID uses to assign IP addresses.
-        type: str
-        choices: ['NAT mode',
-                  'Bridge mode',
-                  'Layer 3 roaming',
-                  'Layer 3 roaming with a concentrator',
-                  'VPN']
-    lan_isolation_enabled:
-        description:
-        - Enable or disable Layer 2 Lan isolation.
-        - Requires C(ip_assignment_mode) to be C(Bridge mode).
-        type: bool
-    use_vlan_tagging:
-        description:
-        - Set whether to use VLAN tagging.
-        - Requires C(default_vlan_id) to be set.
-        type: bool
-    visible:
+      vlan_id:
         description:
-        - Enable or disable whether APs should broadcast this SSID.
-        type: bool
-    default_vlan_id:
-        description:
-        - Default VLAN ID.
-        - Requires C(ip_assignment_mode) to be C(Bridge mode) or C(Layer 3 roaming).
+          - Numerical identifier that is assigned to the VLAN.
         type: int
-    vlan_id:
+    type: list
+  auth_mode:
+    choices:
+      - open
+      - psk
+      - open-with-radius
+      - 8021x-meraki
+      - 8021x-radius
+    description:
+      - Set authentication mode of network.
+    type: str
+  available_on_all_aps:
+    description:
+      - Set whether all APs should broadcast the SSID or if it should be restricted
+        to APs matching any availability tags.
+      - Requires C(ap_availability_tags) to be defined when set to C(False).
+    type: bool
+  band_selection:
+    choices:
+      - Dual band operation
+      - 5 GHz band only
+      - Dual band operation with Band Steering
+    description:
+      - Set band selection mode.
+    type: str
+  concentrator_network_id:
+    description:
+      - The concentrator to use for 'Layer 3 roaming with a concentrator' or 'VPN'.
+    type: str
+  default_vlan_id:
+    description:
+      - Default VLAN ID.
+      - Requires C(ip_assignment_mode) to be C(Bridge mode) or C(Layer 3 roaming).
+    type: int
+  enabled:
+    description:
+      - Enable or disable SSID network.
+    type: bool
+  encryption_mode:
+    choices:
+      - wpa
+      - eap
+      - wpa-eap
+    description:
+      - Set encryption mode of network.
+    type: str
+  enterprise_admin_access:
+    choices:
+      - access disabled
+      - access enabled
+    description:
+      - Whether SSID is accessible by enterprise administrators.
+    type: str
+  ip_assignment_mode:
+    choices:
+      - NAT mode
+      - Bridge mode
+      - Layer 3 roaming
+      - Layer 3 roaming with a concentrator
+      - VPN
+    description:
+      - Method of which SSID uses to assign IP addresses.
+    type: str
+  lan_isolation_enabled:
+    description:
+      - Enable or disable Layer 2 Lan isolation.
+      - Requires C(ip_assignment_mode) to be C(Bridge mode).
+    type: bool
+  min_bitrate:
+    choices:
+      - 1
+      - 2
+      - 5.5
+      - 6
+      - 9
+      - 11
+      - 12
+      - 18
+      - 24
+      - 36
+      - 48
+      - 54
+    description:
+      - Minimum bitrate (Mbps) allowed on SSID.
+    type: float
+  name:
+    description:
+      - Name of SSID.
+    type: str
+  net_id:
+    description:
+      - ID of network.
+    type: str
+  net_name:
+    description:
+      - Name of network.
+    type: str
+  number:
+    aliases:
+      - ssid_number
+    description:
+      - SSID number within network.
+    type: int
+  per_client_bandwidth_limit_down:
+    description:
+      - Maximum bandwidth in Mbps devices on SSID can download.
+    type: int
+  per_client_bandwidth_limit_up:
+    description:
+      - Maximum bandwidth in Mbps devices on SSID can upload.
+    type: int
+  psk:
+    description:
+      - Password for wireless network.
+      - Requires auth_mode to be set to psk.
+    type: str
+  radius_accounting_enabled:
+    description:
+      - Enable or disable RADIUS accounting.
+    type: bool
+  radius_accounting_servers:
+    description:
+      - List of RADIUS servers for RADIUS accounting.
+    elements: dict
+    suboptions:
+      host:
+        description:
+          - IP address or hostname of RADIUS server.
+        required: true
+        type: str
+      port:
         description:
-        - ID number of VLAN on SSID.
-        - Requires C(ip_assignment_mode) to be C(ayer 3 roaming with a concentrator) or C(VPN).
+          - Port number RADIUS server is listening to.
         type: int
-    ap_tags_vlan_ids:
-        description:
-        - List of VLAN tags.
-        - Requires C(ip_assignment_mode) to be C(Bridge mode) or C(Layer 3 roaming).
-        - Requires C(use_vlan_tagging) to be C(True).
-        type: list
-        elements: dict
-        suboptions:
-            tags:
-                description:
-                - List of AP tags.
-                type: list
-                elements: str
-            vlan_id:
-                description:
-                - Numerical identifier that is assigned to the VLAN.
-                type: int
-    walled_garden_enabled:
-        description:
-        - Enable or disable walled garden functionality.
-        type: bool
-    walled_garden_ranges:
-        description:
-        - List of walled garden ranges.
-        type: list
-        elements: str
-    available_on_all_aps:
-        description:
-        - Set whether all APs should broadcast the SSID or if it should be restricted to APs matching any availability tags.
-        - Requires C(ap_availability_tags) to be defined when set to C(False).
-        type: bool
-    ap_availability_tags:
+      secret:
         description:
-        - Set whether SSID will be broadcast by APs with tags matching any of the tags in this list.
-        - Requires C(available_on_all_aps) to be C(false).
-        type: list
-        elements: str
-    min_bitrate:
-        description:
-        - Minimum bitrate (Mbps) allowed on SSID.
-        type: float
-        choices: [1, 2, 5.5, 6, 9, 11, 12, 18, 24, 36, 48, 54]
-    band_selection:
-        description:
-        - Set band selection mode.
+          - RADIUS password.
+          - Setting password is not idempotent.
         type: str
-        choices: ['Dual band operation', '5 GHz band only', 'Dual band operation with Band Steering']
-    per_client_bandwidth_limit_up:
-        description:
-        - Maximum bandwidth in Mbps devices on SSID can upload.
-        type: int
-    per_client_bandwidth_limit_down:
+    type: list
+  radius_coa_enabled:
+    description:
+      - Enable or disable RADIUS CoA (Change of Authorization) on SSID.
+    type: bool
+  radius_failover_policy:
+    choices:
+      - Deny access
+      - Allow access
+    description:
+      - Set client access policy in case RADIUS servers aren't available.
+    type: str
+  radius_load_balancing_policy:
+    choices:
+      - Strict priority order
+      - Round robin
+    description:
+      - Set load balancing policy when multiple RADIUS servers are specified.
+    type: str
+  radius_proxy_enabled:
+    description:
+      - Enable or disable RADIUS Proxy on SSID.
+    type: bool
+  radius_servers:
+    description:
+      - List of RADIUS servers.
+    elements: dict
+    suboptions:
+      host:
+        description:
+          - IP address or hostname of RADIUS server.
+        required: true
+        type: str
+      port:
         description:
-        - Maximum bandwidth in Mbps devices on SSID can download.
+          - Port number RADIUS server is listening to.
         type: int
-    concentrator_network_id:
-        description:
-        - The concentrator to use for 'Layer 3 roaming with a concentrator' or 'VPN'.
-        type: str
-    enterprise_admin_access:
+      secret:
         description:
-        - Whether SSID is accessible by enterprise administrators.
+          - RADIUS password.
+          - Setting password is not idempotent.
         type: str
-        choices: ['access disabled', 'access enabled']
-    splash_guest_sponsor_domains:
-        description:
-        - List of valid sponsor email domains for sponsored guest portal.
-        type: list
-        elements: str
-author:
-- Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  splash_guest_sponsor_domains:
+    description:
+      - List of valid sponsor email domains for sponsored guest portal.
+    elements: str
+    type: list
+  splash_page:
+    choices:
+      - None
+      - Click-through splash page
+      - Billing
+      - Password-protected with Meraki RADIUS
+      - Password-protected with custom RADIUS
+      - Password-protected with Active Directory
+      - Password-protected with LDAP
+      - SMS authentication
+      - Systems Manager Sentry
+      - Facebook Wi-Fi
+      - Google OAuth
+      - Sponsored guest
+      - Cisco ISE
+    description:
+      - Set to enable splash page and specify type of splash.
+    type: str
+  state:
+    choices:
+      - absent
+      - query
+      - present
+    default: present
+    description:
+      - Specifies whether SNMP information should be queried or modified.
+    type: str
+  use_vlan_tagging:
+    description:
+      - Set whether to use VLAN tagging.
+      - Requires C(default_vlan_id) to be set.
+    type: bool
+  visible:
+    description:
+      - Enable or disable whether APs should broadcast this SSID.
+    type: bool
+  vlan_id:
+    description:
+      - ID number of VLAN on SSID.
+      - Requires C(ip_assignment_mode) to be C(ayer 3 roaming with a concentrator)
+        or C(VPN).
+    type: int
+  walled_garden_enabled:
+    description:
+      - Enable or disable walled garden functionality.
+    type: bool
+  walled_garden_ranges:
+    description:
+      - List of walled garden ranges.
+    elements: str
+    type: list
+  wpa_encryption_mode:
+    choices:
+      - WPA1 and WPA2
+      - WPA2 only
+      - WPA3 Transition Mode
+      - WPA3 only
+    description:
+      - Encryption mode within WPA specification.
+    type: str
+short_description: Manage wireless SSIDs in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -271,7 +312,6 @@
     enabled: true
     visible: true
   delegate_to: localhost
-
 - name: Set PSK with invalid encryption mode
   meraki_ssid:
     auth_key: abc123
@@ -282,9 +322,8 @@
     auth_mode: psk
     psk: abc1234
     encryption_mode: eap
-  ignore_errors: yes
+  ignore_errors: true
   delegate_to: localhost
-
 - name: Configure RADIUS servers
   meraki_ssid:
     auth_key: abc123
@@ -298,7 +337,6 @@
         port: 1234
         secret: abc98765
   delegate_to: localhost
-
 - name: Enable click-through splash page
   meraki_ssid:
     auth_key: abc123
diff --git a/plugins/modules/meraki_ms_access_policies.py b/plugins/modules/meraki_ms_access_policies.py
index ae1d115d4..f15f1b6c0 100644
--- a/plugins/modules/meraki_ms_access_policies.py
+++ b/plugins/modules/meraki_ms_access_policies.py
@@ -16,146 +16,161 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_ms_access_policies
-short_description: Manage Switch Access Policies in the Meraki cloud
-description: Module for managing a Switch Access Policies in the Meraki cloud
+author:
+  - "Marcin Wo\u017Aniak (@y0rune)"
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_switch_access_policies
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description: Module for managing a Switch Access Policies in the Meraki cloud
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_ms_access_policies
 options:
-    state:
-        description:
-        - Specifies whether SNMP information should be queried or modified.
-        type: str
-        choices: [ absent, query, present ]
-        default: present
-    number:
-        description:
-        - Number of the access_policy.
-        type: int
-        aliases: [access_policy_number]
-    name:
-        description:
-        - Name of Access Policy.
-        type: str
-    net_id:
-        description:
-        - ID of network.
-        type: str
-    org_id:
-        description:
-        - ID of organization associated to a network.
-        type: str
-    net_name:
-        description:
-        - Name of a network.
-        aliases: [network]
-        type: str
-    auth_method:
+  access_policy_type:
+    choices:
+      - 802.1x
+      - MAC authentication bypass
+      - Hybrid authentication
+    description:
+      - Set type of the access policy
+    type: str
+  auth_method:
+    choices:
+      - Meraki authentication
+      - my RADIUS server
+    description:
+      - Set authentication method in the policy.
+    type: str
+  data_vlan_id:
+    description:
+      - Set a Data VLAN ID for Critical Auth VLAN
+    type: int
+  guest_vlan:
+    description:
+      - Guest Vlan
+    type: int
+  host_mode:
+    choices:
+      - Single-Host
+      - Multi-Domain
+      - Multi-Host
+      - Multi-Auth
+    description:
+      - Choose the Host Mode for the access policy.
+    type: str
+  name:
+    description:
+      - Name of Access Policy.
+    type: str
+  net_id:
+    description:
+      - ID of network.
+    type: str
+  net_name:
+    aliases:
+      - network
+    description:
+      - Name of a network.
+    type: str
+  number:
+    aliases:
+      - access_policy_number
+    description:
+      - Number of the access_policy.
+    type: int
+  org_id:
+    description:
+      - ID of organization associated to a network.
+    type: str
+  radius_accounting_enabled:
+    description:
+      - Enable or disable RADIUS accounting.
+    type: bool
+  radius_accounting_servers:
+    description:
+      - List of RADIUS servers for RADIUS accounting.
+    elements: dict
+    suboptions:
+      host:
         description:
-        - Set authentication method in the policy.
+          - IP address or hostname of RADIUS server.
+        required: true
         type: str
-        choices: ["Meraki authentication", "my RADIUS server"]
-    guest_vlan:
+      port:
         description:
-        - Guest Vlan
+          - Port number RADIUS server is listening to.
         type: int
-    access_policy_type:
+      secret:
         description:
-        - Set type of the access policy
+          - RADIUS password.
         type: str
-        choices: ["802.1x", "MAC authentication bypass", "Hybrid authentication"]
-    systems_management_enrollment:
-        description:
-        - Set if the Systems Management Enrollemnt is enabled or disabled
-        type: bool
-        default: False
-    radius_servers:
-        description:
-        - List of RADIUS servers.
-        type: list
-        elements: dict
-        suboptions:
-            host:
-                description:
-                - IP address or hostname of RADIUS server.
-                type: str
-                required: true
-            port:
-                description:
-                - Port number RADIUS server is listening to.
-                type: int
-            secret:
-                description:
-                - RADIUS password.
-                - Setting password is not idempotent.
-                type: str
-    radius_testing:
-        description:
-        - Set status of testing a radius.
-        type: bool
-        default: True
-    voice_vlan_clients:
-        description:
-        - If is enabled that means Voice VLAN client require authentication
-        type: bool
-        default: True
-    radius_coa_enabled:
-        description:
-        - Enable or disable RADIUS CoA (Change of Authorization).
-        type: bool
-    radius_accounting_enabled:
+    type: list
+  radius_attribute_group_policy_name:
+    choices:
+      - Filter-Id
+      - ''
+    default: ''
+    description:
+      - Enable that attribute for a RADIUS
+    type: str
+  radius_coa_enabled:
+    description:
+      - Enable or disable RADIUS CoA (Change of Authorization).
+    type: bool
+  radius_servers:
+    description:
+      - List of RADIUS servers.
+    elements: dict
+    suboptions:
+      host:
         description:
-        - Enable or disable RADIUS accounting.
-        type: bool
-    radius_accounting_servers:
-        description:
-        - List of RADIUS servers for RADIUS accounting.
-        type: list
-        elements: dict
-        suboptions:
-            host:
-                description:
-                - IP address or hostname of RADIUS server.
-                type: str
-                required: true
-            port:
-                description:
-                - Port number RADIUS server is listening to.
-                type: int
-            secret:
-                description:
-                - RADIUS password.
-                type: str
-    host_mode:
-        description:
-        - Choose the Host Mode for the access policy.
+          - IP address or hostname of RADIUS server.
+        required: true
         type: str
-        choices: ["Single-Host", "Multi-Domain", "Multi-Host", "Multi-Auth"]
-    data_vlan_id:
+      port:
         description:
-        - Set a Data VLAN ID for Critical Auth VLAN
+          - Port number RADIUS server is listening to.
         type: int
-    voice_vlan_id:
-        description:
-        - Set a Voice VLAN ID for Critical Auth VLAN
-        type: int
-    suspend_port_bounce:
-        description:
-        - Enable or disable the Suspend Port Bounce when RADIUS servers are unreachable.
-        type: bool
-        default: False
-    radius_attribute_group_policy_name:
+      secret:
         description:
-        - Enable that attribute for a RADIUS
+          - RADIUS password.
+          - Setting password is not idempotent.
         type: str
-        choices: ["Filter-Id", ""]
-        default: ""
-author:
-- Marcin Woźniak (@y0rune)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  radius_testing:
+    default: true
+    description:
+      - Set status of testing a radius.
+    type: bool
+  state:
+    choices:
+      - absent
+      - query
+      - present
+    default: present
+    description:
+      - Specifies whether SNMP information should be queried or modified.
+    type: str
+  suspend_port_bounce:
+    default: false
+    description:
+      - Enable or disable the Suspend Port Bounce when RADIUS servers are unreachable.
+    type: bool
+  systems_management_enrollment:
+    default: false
+    description:
+      - Set if the Systems Management Enrollemnt is enabled or disabled
+    type: bool
+  voice_vlan_clients:
+    default: true
+    description:
+      - If is enabled that means Voice VLAN client require authentication
+    type: bool
+  voice_vlan_id:
+    description:
+      - Set a Voice VLAN ID for Critical Auth VLAN
+    type: int
+short_description: Manage Switch Access Policies in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -163,30 +178,29 @@
   cisco.meraki.meraki_ms_access_policies:
     auth_key: abc123
     state: present
-    name: "Meraki authentication policy"
-    auth_method: "Meraki authentication"
+    name: Meraki authentication policy
+    auth_method: Meraki authentication
     net_name: YourNet
     org_name: YourOrg
   delegate_to: localhost
-
 - name: Create access policy with auth_method is "my Radius Server"
   cisco.meraki.meraki_ms_access_policies:
     auth_key: abc123
-    access_policy_type: "802.1x"
-    host_mode: "Single-Host"
+    access_policy_type: 802.1x
+    host_mode: Single-Host
     state: present
-    name: "Meraki authentication policy"
-    auth_method: "my RADIUS server"
+    name: Meraki authentication policy
+    auth_method: my RADIUS server
     radius_servers:
       - host: 192.0.1.18
         port: 7890
         secret: secret123
     net_name: YourNet
     org_name: YourOrg
-    radius_coa_enabled: False
-    radius_accounting_enabled: False
+    radius_coa_enabled: false
+    radius_accounting_enabled: false
     guest_vlan: 10
-    voice_vlan_clients: False
+    voice_vlan_clients: false
 """
 
 RETURN = r"""
@@ -239,7 +253,7 @@
                             description: Enable or disable suspend port bounce
                             returned: success
                             type: bool
-                            sample: False
+                            sample: false
                         voice_vlan_id:
                             description: VLAN ID for voice
                             returned: success
@@ -283,12 +297,12 @@
             description: Enable or disable Radius Testing
             returned: success
             type: bool
-            sample: True
+            sample: true
         voice_vlan_clients:
             description: Enable or disable Voice Vlan Clients
             returned: success
             type: bool
-            sample: False
+            sample: false
 """
 
 from ansible.module_utils.basic import AnsibleModule, json
diff --git a/plugins/modules/meraki_ms_link_aggregation.py b/plugins/modules/meraki_ms_link_aggregation.py
index 25527c3fb..9fe1b48ee 100644
--- a/plugins/modules/meraki_ms_link_aggregation.py
+++ b/plugins/modules/meraki_ms_link_aggregation.py
@@ -67,32 +67,32 @@
 EXAMPLES = r'''
 - name: Create LAG
   meraki_ms_link_aggregation:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: present
-    org_name: '{{test_org_name}}'
-    net_name: '{{test_switch_net_name}}'
+    org_name: '{{ test_org_name }}'
+    net_name: '{{ test_switch_net_name }}'
     switch_ports:
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "1"
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "2"
   delegate_to: localhost
 
 - name: Update LAG
   meraki_ms_link_aggregation:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: present
-    org_name: '{{test_org_name}}'
-    net_name: '{{test_switch_net_name}}'
-    lag_id: '{{lag_id}}'
+    org_name: '{{ test_org_name }}'
+    net_name: '{{ test_switch_net_name }}'
+    lag_id: '{{ lag_id }}'
     switch_ports:
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "1"
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "2"
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "3"
-      - serial: '{{serial_switch}}'
+      - serial: '{{ serial_switch }}'
         port_id: "4"
   delegate_to: localhost
 '''
diff --git a/plugins/modules/meraki_ms_ospf.py b/plugins/modules/meraki_ms_ospf.py
index 26983b906..023ced4fe 100644
--- a/plugins/modules/meraki_ms_ospf.py
+++ b/plugins/modules/meraki_ms_ospf.py
@@ -100,30 +100,27 @@
 '''
 
 EXAMPLES = r'''
-  - name: Query OSPF settings
-    meraki_ms_ospf:
-      auth_key: abc123
-      org_name: YourOrg
-      net_name: YourNet
-      state: query
-    delegate_to: localhost
+- name: Query OSPF settings
+  meraki_ms_ospf:
+    auth_key: abc123
+    org_name: YourOrg
+    net_name: YourNet
+    state: query
+  delegate_to: localhost
 
-  - name: Enable OSPF with check mode
-    meraki_ms_ospf:
-      auth_key: abc123
-      org_name: YourOrg
-      net_name: YourNet
-      state: present
-      enabled: true
-      hello_timer: 20
-      dead_timer: 60
-      areas:
-        - area_id: 0
-          area_name: Backbone
-          area_type: normal
-        - area_id: 1
-          area_name: Office
-          area_type: nssa
+- name: Enable OSPF with check mode
+  meraki_ms_ospf:
+    auth_key: abc123
+    org_name: YourOrg
+    net_name: YourNet
+    state: present
+    enabled: true
+    hello_timer: 20
+    dead_timer: 60
+    areas:
+      area_id: 0
+      area_name: Backbone
+      area_type: normal
       md5_authentication_enabled: false
 '''
 
diff --git a/plugins/modules/meraki_ms_stack.py b/plugins/modules/meraki_ms_stack.py
index a5661c68b..46b34e1ea 100644
--- a/plugins/modules/meraki_ms_stack.py
+++ b/plugins/modules/meraki_ms_stack.py
@@ -69,8 +69,8 @@
     net_name: YourNet
     name: Test stack
     serials:
-    - "ABCD-1231-4579"
-    - "ASDF-4321-0987"
+      - "ABCD-1231-4579"
+      - "ASDF-4321-0987"
 
 - name: Add switch to stack
   meraki_switch_stack:
@@ -80,7 +80,7 @@
     net_name: YourNet
     stack_id: ABC12340987
     serials:
-    - "ABCD-1231-4579"
+      - "ABCD-1231-4579"
 
 - name: Remove switch from stack
   meraki_switch_stack:
@@ -90,7 +90,7 @@
     net_name: YourNet
     stack_id: ABC12340987
     serials:
-    - "ABCD-1231-4579"
+      - "ABCD-1231-4579"
 
 - name: Query one stack
   meraki_switch_stack:
@@ -108,22 +108,22 @@
     type: complex
     contains:
         id:
-            description: ID of switch stack.
-            returned: always
-            type: str
-            sample: 7636
+          description: ID of switch stack.
+          returned: always
+          type: str
+          sample: 7636
         name:
-            description: Descriptive name of switch stack.
-            returned: always
-            type: str
-            sample: MyStack
+          description: Descriptive name of switch stack.
+          returned: always
+          type: str
+          sample: MyStack
         serials:
             description: List of serial numbers in switch stack.
             returned: always
             type: list
             sample:
-            - "QBZY-XWVU-TSRQ"
-            - "QBAB-CDEF-GHIJ"
+              - "QBZY-XWVU-TSRQ"
+              - "QBAB-CDEF-GHIJ"
 '''
 
 from ansible.module_utils.basic import AnsibleModule, json
diff --git a/plugins/modules/meraki_ms_switchport.py b/plugins/modules/meraki_ms_switchport.py
index 1429b79e2..3111a847c 100644
--- a/plugins/modules/meraki_ms_switchport.py
+++ b/plugins/modules/meraki_ms_switchport.py
@@ -15,179 +15,203 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_ms_switchport
-short_description: Manage switchports on a switch in the Meraki cloud
-description:
-- Allows for management of switchports settings for Meraki MS switches.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.devices_switch_ports
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for management of switchports settings for Meraki MS switches.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_ms_switchport
 options:
-    state:
-        description:
-        - Specifies whether a switchport should be queried or modified.
-        choices: [query, present]
-        default: query
-        type: str
-    access_policy_type:
-        description:
-        - Type of access policy to apply to port.
-        type: str
-        choices: [Open, Custom access policy, MAC allow list, Sticky MAC allow list]
-    access_policy_number:
+  access_policy_number:
+    description:
+      - Number of the access policy to apply.
+      - Only applicable to access port types.
+    type: int
+  access_policy_type:
+    choices:
+      - Open
+      - Custom access policy
+      - MAC allow list
+      - Sticky MAC allow list
+    description:
+      - Type of access policy to apply to port.
+    type: str
+  allowed_vlans:
+    default: all
+    description:
+      - List of VLAN numbers to be allowed on switchport.
+    elements: str
+    type: list
+  enabled:
+    default: true
+    description:
+      - Whether a switchport should be enabled or disabled.
+    type: bool
+  flexible_stacking_enabled:
+    description:
+      - Whether flexible stacking capabilities are supported on the port.
+    type: bool
+  isolation_enabled:
+    default: false
+    description:
+      - Isolation status of switchport.
+    type: bool
+  link_negotiation:
+    choices:
+      - 1 Gigabit full duplex (auto)
+      - 1 Gigabit full duplex (forced)
+      - 10 Gigabit full duplex (auto)
+      - 10 Gigabit full duplex (forced)
+      - 100 Megabit (auto)
+      - 100 Megabit full duplex (forced)
+      - 2.5 Gigabit full duplex (auto)
+      - 2.5 Gigabit full duplex (forced)
+      - 5 Gigabit full duplex (auto)
+      - 5 Gigabit full duplex (forced)
+      - Auto negotiate
+    default: Auto negotiate
+    description:
+      - Link speed for the switchport.
+    type: str
+  mac_allow_list:
+    description:
+      - MAC addresses list that are allowed on a port.
+      - Only applicable to access port type.
+      - Only applicable to access_policy_type "MAC allow list".
+    suboptions:
+      macs:
         description:
-        - Number of the access policy to apply.
-        - Only applicable to access port types.
-        type: int
-    allowed_vlans:
-        description:
-        - List of VLAN numbers to be allowed on switchport.
-        default: all
-        type: list
+          - List of MAC addresses to update with based on state option.
         elements: str
-    enabled:
-        description:
-        - Whether a switchport should be enabled or disabled.
-        type: bool
-        default: yes
-    isolation_enabled:
-        description:
-        - Isolation status of switchport.
-        default: no
-        type: bool
-    link_negotiation:
-        description:
-        - Link speed for the switchport.
-        default: Auto negotiate
-        choices: [1 Gigabit full duplex (auto),
-                1 Gigabit full duplex (forced),
-                10 Gigabit full duplex (auto),
-                10 Gigabit full duplex (forced),
-                100 Megabit (auto),
-                100 Megabit full duplex (forced),
-                2.5 Gigabit full duplex (auto),
-                2.5 Gigabit full duplex (forced),
-                5 Gigabit full duplex (auto),
-                5 Gigabit full duplex (forced),
-                Auto negotiate]
-        type: str
-    name:
-        description:
-        - Switchport description.
-        aliases: [description]
-        type: str
-    number:
-        description:
-        - Port number.
-        type: str
-    poe_enabled:
-        description:
-        - Enable or disable Power Over Ethernet on a port.
-        type: bool
-        default: true
-    rstp_enabled:
-        description:
-        - Enable or disable Rapid Spanning Tree Protocol on a port.
-        type: bool
-        default: true
-    serial:
-        description:
-        - Serial nubmer of the switch.
-        type: str
-        required: true
-    stp_guard:
-        description:
-        - Set state of STP guard.
-        choices: [disabled, root guard, bpdu guard, loop guard]
-        default: disabled
-        type: str
-    tags:
-        description:
-        - List of tags to assign to a port.
         type: list
-        elements: str
-    type:
+      state:
+        choices:
+          - merged
+          - replaced
+          - deleted
+        default: replaced
         description:
-        - Set port type.
-        choices: [access, trunk]
-        default: access
+          - The state the configuration should be left in.
+          - Merged, MAC addresses provided will be added to the current allow list.
+          - Replaced, All MAC addresses are overwritten, only the MAC addresses provided
+            with exist in the allow list.
+          - Deleted, Remove the MAC addresses provided from the current allow list.
         type: str
-    vlan:
-        description:
-        - VLAN number assigned to port.
-        - If a port is of type trunk, the specified VLAN is the native VLAN.
-        - Setting value to 0 on a trunk will clear the VLAN.
-        type: int
-    voice_vlan:
+    type: dict
+  name:
+    aliases:
+      - description
+    description:
+      - Switchport description.
+    type: str
+  number:
+    description:
+      - Port number.
+    type: str
+  poe_enabled:
+    default: true
+    description:
+      - Enable or disable Power Over Ethernet on a port.
+    type: bool
+  rstp_enabled:
+    default: true
+    description:
+      - Enable or disable Rapid Spanning Tree Protocol on a port.
+    type: bool
+  serial:
+    description:
+      - Serial nubmer of the switch.
+    required: true
+    type: str
+  state:
+    choices:
+      - query
+      - present
+    default: query
+    description:
+      - Specifies whether a switchport should be queried or modified.
+    type: str
+  sticky_mac_allow_list:
+    description:
+      - MAC addresses list that are allowed on a port.
+      - Only applicable to access port type.
+      - Only applicable to access_policy_type "Sticky MAC allow list".
+    suboptions:
+      macs:
         description:
-        - VLAN number assigned to a port for voice traffic.
-        - Only applicable to access port type.
-        - Only applicable if voice_vlan_state is set to present.
-        type: int
-    voice_vlan_state:
+          - List of MAC addresses to update with based on state option.
+        elements: str
+        type: list
+      state:
+        choices:
+          - merged
+          - replaced
+          - deleted
+        default: replaced
         description:
-        - Specifies whether voice vlan configuration should be present or absent.
-        choices: [absent, present]
-        default: present
+          - The state the configuration should be left in.
+          - Merged, MAC addresses provided will be added to the current allow list.
+          - Replaced, All MAC addresses are overwritten, only the MAC addresses provided
+            with exist in the allow list.
+          - Deleted, Remove the MAC addresses provided from the current allow list.
         type: str
-    mac_allow_list:
-        description:
-        - MAC addresses list that are allowed on a port.
-        - Only applicable to access port type.
-        - Only applicable to access_policy_type "MAC allow list".
-        type: dict
-        suboptions:
-            state:
-                description:
-                - The state the configuration should be left in.
-                - Merged, MAC addresses provided will be added to the current allow list.
-                - Replaced, All MAC addresses are overwritten, only the MAC addresses provided with exist in the allow list.
-                - Deleted, Remove the MAC addresses provided from the current allow list.
-                type: str
-                choices: [merged, replaced, deleted]
-                default: replaced
-            macs:
-                description:
-                - List of MAC addresses to update with based on state option.
-                type: list
-                elements: str
-    sticky_mac_allow_list:
-        description:
-        - MAC addresses list that are allowed on a port.
-        - Only applicable to access port type.
-        - Only applicable to access_policy_type "Sticky MAC allow list".
-        type: dict
-        suboptions:
-            state:
-                description:
-                - The state the configuration should be left in.
-                - Merged, MAC addresses provided will be added to the current allow list.
-                - Replaced, All MAC addresses are overwritten, only the MAC addresses provided with exist in the allow list.
-                - Deleted, Remove the MAC addresses provided from the current allow list.
-                type: str
-                choices: ["merged", "replaced", "deleted"]
-                default: replaced
-            macs:
-                description:
-                - List of MAC addresses to update with based on state option.
-                type: list
-                elements: str
-    sticky_mac_allow_list_limit:
-        description:
-        - The number of MAC addresses allowed in the sticky port allow list.
-        - Only applicable to access port type.
-        - Only applicable to access_policy_type "Sticky MAC allow list".
-        - The value must be equal to or greater then the list size of sticky_mac_allow_list. Value will be checked for validity, during processing.
-        type: int
-    flexible_stacking_enabled:
-        description:
-        - Whether flexible stacking capabilities are supported on the port.
-        type: bool
-author:
-- Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: dict
+  sticky_mac_allow_list_limit:
+    description:
+      - The number of MAC addresses allowed in the sticky port allow list.
+      - Only applicable to access port type.
+      - Only applicable to access_policy_type "Sticky MAC allow list".
+      - The value must be equal to or greater then the list size of sticky_mac_allow_list.
+        Value will be checked for validity, during processing.
+    type: int
+  stp_guard:
+    choices:
+      - disabled
+      - root guard
+      - bpdu guard
+      - loop guard
+    default: disabled
+    description:
+      - Set state of STP guard.
+    type: str
+  tags:
+    description:
+      - List of tags to assign to a port.
+    elements: str
+    type: list
+  type:
+    choices:
+      - access
+      - trunk
+    default: access
+    description:
+      - Set port type.
+    type: str
+  vlan:
+    description:
+      - VLAN number assigned to port.
+      - If a port is of type trunk, the specified VLAN is the native VLAN.
+      - Setting value to 0 on a trunk will clear the VLAN.
+    type: int
+  voice_vlan:
+    description:
+      - VLAN number assigned to a port for voice traffic.
+      - Only applicable to access port type.
+      - Only applicable if voice_vlan_state is set to present.
+    type: int
+  voice_vlan_state:
+    choices:
+      - absent
+      - present
+    default: present
+    description:
+      - Specifies whether voice vlan configuration should be present or absent.
+    type: str
+short_description: Manage switchports on a switch in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -197,7 +221,6 @@
     state: query
     serial: ABC-123
   delegate_to: localhost
-
 - name: Query information about all switchports on a switch
   meraki_switchport:
     auth_key: abc12345
@@ -205,7 +228,6 @@
     serial: ABC-123
     number: 2
   delegate_to: localhost
-
 - name: Name switchport
   meraki_switchport:
     auth_key: abc12345
@@ -214,7 +236,6 @@
     number: 7
     name: Test Port
   delegate_to: localhost
-
 - name: Configure access port with voice VLAN
   meraki_switchport:
     auth_key: abc12345
@@ -228,7 +249,6 @@
     vlan: 10
     voice_vlan: 11
   delegate_to: localhost
-
 - name: Check access port for idempotency
   meraki_switchport:
     auth_key: abc12345
@@ -242,7 +262,6 @@
     vlan: 10
     voice_vlan: 11
   delegate_to: localhost
-
 - name: Configure trunk port with specific VLANs
   meraki_switchport:
     auth_key: abc12345
@@ -258,7 +277,6 @@
       - 15
       - 20
   delegate_to: localhost
-
 - name: Configure access port with sticky MAC allow list and limit.
   meraki_switchport:
     auth_key: abc12345
@@ -267,13 +285,12 @@
     number: 5
     sticky_mac_allow_limit: 3
     sticky_mac_allow_list:
-        macs:
-          - aa:aa:bb:bb:cc:cc
-          - bb:bb:aa:aa:cc:cc
-          - 11:aa:bb:bb:cc:cc
-        state: replaced
+      macs:
+        - aa:aa:bb:bb:cc:cc
+        - bb:bb:aa:aa:cc:cc
+        - 11:aa:bb:bb:cc:cc
+      state: replaced
     delegate_to: localhost
-
 - name: Delete an existing MAC address from the sticky MAC allow list.
   meraki_switchport:
     auth_key: abc12345
@@ -281,11 +298,10 @@
     serial: ABC-123
     number: 5
     sticky_mac_allow_list:
-        macs:
-          - aa:aa:bb:bb:cc:cc
-        state: deleted
+      macs:
+        - aa:aa:bb:bb:cc:cc
+      state: deleted
     delegate_to: localhost
-
 - name: Add a MAC address to sticky MAC allow list.
   meraki_switchport:
     auth_key: abc12345
@@ -293,9 +309,9 @@
     serial: ABC-123
     number: 5
     sticky_mac_allow_list:
-        macs:
-          - 22:22:bb:bb:cc:cc
-        state: merged
+      macs:
+        - 22:22:bb:bb:cc:cc
+      state: merged
     delegate_to: localhost
 """
 
diff --git a/plugins/modules/meraki_mx_content_filtering.py b/plugins/modules/meraki_mx_content_filtering.py
index de4755f11..7304e9303 100644
--- a/plugins/modules/meraki_mx_content_filtering.py
+++ b/plugins/modules/meraki_mx_content_filtering.py
@@ -75,33 +75,33 @@
 '''
 
 EXAMPLES = r'''
-  - name: Set single allowed URL pattern
-    meraki_content_filtering:
-      auth_key: abc123
-      org_name: YourOrg
-      net_name: YourMXNet
-      allowed_urls:
-        - "http://www.ansible.com/*"
+- name: Set single allowed URL pattern
+  meraki_content_filtering:
+    auth_key: abc123
+    org_name: YourOrg
+    net_name: YourMXNet
+    allowed_urls:
+      - "http://www.ansible.com/*"
 
-  - name: Set blocked URL category
-    meraki_content_filtering:
-      auth_key: abc123
-      org_name: YourOrg
-      net_name: YourMXNet
-      state: present
-      category_list_size: full list
-      blocked_categories:
-        - "Adult and Pornography"
+- name: Set blocked URL category
+  meraki_content_filtering:
+    auth_key: abc123
+    org_name: YourOrg
+    net_name: YourMXNet
+    state: present
+    category_list_size: full list
+    blocked_categories:
+      - "Adult and Pornography"
 
-  - name: Remove match patterns and categories
-    meraki_content_filtering:
-      auth_key: abc123
-      org_name: YourOrg
-      net_name: YourMXNet
-      state: present
-      category_list_size: full list
-      allowed_urls: []
-      blocked_urls: []
+- name: Remove match patterns and categories
+  meraki_content_filtering:
+    auth_key: abc123
+    org_name: YourOrg
+    net_name: YourMXNet
+    state: present
+    category_list_size: full list
+    allowed_urls: []
+    blocked_urls: []
 '''
 
 RETURN = r'''
diff --git a/plugins/modules/meraki_mx_intrusion_prevention.py b/plugins/modules/meraki_mx_intrusion_prevention.py
index cd9300be7..8f7bd64bd 100644
--- a/plugins/modules/meraki_mx_intrusion_prevention.py
+++ b/plugins/modules/meraki_mx_intrusion_prevention.py
@@ -64,9 +64,9 @@
                 description:
                 - Description of rule.
                 - This is overwritten by the API.
-                - Formerly C(message) which was deprecated but still maintained as an alias.
+                - Formerly C(message_rule) which was deprecated but still maintained as an alias.
                 type: str
-                aliases: [ message ]
+                aliases: [ message_rule ]
                 version_added: "2.3.0"
     protected_networks:
         description:
@@ -96,9 +96,9 @@
 EXAMPLES = r'''
 - name: Set whitelist for organization
   meraki_intrusion_prevention:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: present
-    org_id: '{{test_org_id}}'
+    org_id: '{{ test_org_id }}'
     allowed_rules:
       - rule_id: "meraki:intrusion/snort/GID/01/SID/5805"
         rule_message: Test rule
@@ -106,18 +106,18 @@
 
 - name: Query IPS info for organization
   meraki_intrusion_prevention:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: query
-    org_name: '{{test_org_name}}'
+    org_name: '{{ test_org_name }}'
   delegate_to: localhost
   register: query_org
 
 - name: Set full ruleset with check mode
   meraki_intrusion_prevention:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: present
-    org_name: '{{test_org_name}}'
-    net_name: '{{test_net_name}} - IPS'
+    org_name: '{{ test_org_name }}'
+    net_name: '{{ test_net_name }} - IPS'
     mode: prevention
     ids_rulesets: security
     protected_networks:
@@ -130,9 +130,9 @@
 
 - name: Clear rules from organization
   meraki_intrusion_prevention:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: absent
-    org_name: '{{test_org_name}}'
+    org_name: '{{ test_org_name }}'
     allowed_rules: []
   delegate_to: localhost
 '''
@@ -196,7 +196,7 @@
 
 param_map = {'allowed_rules': 'allowedrules',
              'rule_id': 'ruleId',
-             'rule_message': 'message',
+             'rule_message': 'message_rule',
              'mode': 'mode',
              'protected_networks': 'protectedNetworks',
              'use_default': 'useDefault',
@@ -211,8 +211,8 @@ def main():
 
     allowedrules_arg_spec = dict(rule_id=dict(type='str'),
                                  rule_message=dict(type='str',
-                                                   aliases=['message'],
-                                                   deprecated_aliases=[dict(name='message', version='3.0.0', collection_name='cisco.meraki')]),
+                                                   aliases=['message_rule'],
+                                                   deprecated_aliases=[dict(name='message_rule', version='3.0.0', collection_name='cisco.meraki')]),
                                  )
 
     protected_nets_arg_spec = dict(use_default=dict(type='bool'),
@@ -282,7 +282,7 @@ def main():
             rules = []
             for rule in meraki.params['allowed_rules']:
                 rules.append({'ruleId': rule['rule_id'],
-                              'message': rule['rule_message'],
+                              'message_rule': rule['rule_message'],
                               })
             payload = {'allowedRules': rules}
         else:  # Create payload for network
@@ -316,7 +316,7 @@ def main():
         path = meraki.construct_path('query_org', org_id=org_id)
         original = meraki.request(path, method='GET')
         if net_id is None:  # Set configuration for organization
-            if meraki.is_update_required(original, payload, optional_ignore=['message']):
+            if meraki.is_update_required(original, payload, optional_ignore=['message_rule']):
                 if meraki.module.check_mode is True:
                     original.update(payload)
                     meraki.result['data'] = original
diff --git a/plugins/modules/meraki_mx_l3_firewall.py b/plugins/modules/meraki_mx_l3_firewall.py
index 934046f4e..e5cf109f6 100644
--- a/plugins/modules/meraki_mx_l3_firewall.py
+++ b/plugins/modules/meraki_mx_l3_firewall.py
@@ -86,7 +86,7 @@
                 - Whether to log hints against the firewall rule.
                 - Only applicable if a syslog server is specified against the network.
                 type: bool
-                default: False
+                default: false
     syslog_default_rule:
         description:
         - Whether to log hits against the default firewall rule.
@@ -144,7 +144,7 @@
         dest_port: any
         protocol: any
         policy: deny
-    syslog_default_rule: yes
+    syslog_default_rule: true
   delegate_to: localhost
 '''
 
diff --git a/plugins/modules/meraki_mx_l7_firewall.py b/plugins/modules/meraki_mx_l7_firewall.py
index c36c283c7..5a4651b24 100644
--- a/plugins/modules/meraki_mx_l7_firewall.py
+++ b/plugins/modules/meraki_mx_l7_firewall.py
@@ -119,7 +119,7 @@
     auth_key: abc123
     org_name: YourOrg
     net_name: YourNet
-    categories: yes
+    categories: true
     state: query
   delegate_to: localhost
 
diff --git a/plugins/modules/meraki_mx_malware.py b/plugins/modules/meraki_mx_malware.py
index d8fd9d0e5..dc7c40b3b 100644
--- a/plugins/modules/meraki_mx_malware.py
+++ b/plugins/modules/meraki_mx_malware.py
@@ -82,48 +82,48 @@
 '''
 
 EXAMPLES = r'''
-  - name: Enable malware protection
-    meraki_malware:
-      auth_key: abc123
-      state: present
-      org_name: YourOrg
-      net_name: YourNet
-      mode: enabled
-    delegate_to: localhost
+- name: Enable malware protection
+  meraki_malware:
+    auth_key: abc123
+    state: present
+    org_name: YourOrg
+    net_name: YourNet
+    mode: enabled
+  delegate_to: localhost
 
-  - name: Set whitelisted url
-    meraki_malware:
-      auth_key: abc123
-      state: present
-      org_name: YourOrg
-      net_name: YourNet
-      mode: enabled
-      allowed_urls:
-        - url: www.ansible.com
-          comment: Ansible
-        - url: www.google.com
-          comment: Google
-    delegate_to: localhost
+- name: Set whitelisted url
+  meraki_malware:
+    auth_key: abc123
+    state: present
+    org_name: YourOrg
+    net_name: YourNet
+    mode: enabled
+    allowed_urls:
+      - url: www.ansible.com
+        comment: Ansible
+      - url: www.google.com
+        comment: Google
+  delegate_to: localhost
 
-  - name: Set whitelisted file
-    meraki_malware:
-      auth_key: abc123
-      state: present
-      org_name: YourOrg
-      net_name: YourNet
-      mode: enabled
-      allowed_files:
-        - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
-          comment: random zip
-    delegate_to: localhost
+- name: Set whitelisted file
+  meraki_malware:
+    auth_key: abc123
+    state: present
+    org_name: YourOrg
+    net_name: YourNet
+    mode: enabled
+    allowed_files:
+      - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
+        comment: random zip
+  delegate_to: localhost
 
-  - name: Get malware settings
-    meraki_malware:
-      auth_key: abc123
-      state: query
-      org_name: YourNet
-      net_name: YourOrg
-    delegate_to: localhost
+- name: Get malware settings
+  meraki_malware:
+    auth_key: abc123
+    state: query
+    org_name: YourNet
+    net_name: YourOrg
+  delegate_to: localhost
 '''
 
 RETURN = r'''
diff --git a/plugins/modules/meraki_mx_network_vlan_settings.py b/plugins/modules/meraki_mx_network_vlan_settings.py
index ba2a71d9f..c3a4cea06 100644
--- a/plugins/modules/meraki_mx_network_vlan_settings.py
+++ b/plugins/modules/meraki_mx_network_vlan_settings.py
@@ -15,38 +15,40 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mx_network_vlan_settings
-short_description: Manage VLAN settings for Meraki Networks
-description:
-- Edits VLAN enabled status on a network within Meraki.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_appliance_vlans_settings
-options:
-    state:
-        description:
-        - Create or modify an alert.
-        choices: [ present, query ]
-        type: str
-    net_name:
-        description:
-        - Name of a network.
-        aliases: [ name, network ]
-        type: str
-    net_id:
-        description:
-        - ID number of a network.
-        type: str
-    vlans_enabled:
-        description:
-        - Whether VLANs are enabled on the network.
-        type: bool
-
-author:
-    - Kevin Breit (@kbreit)
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Edits VLAN enabled status on a network within Meraki.
 extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mx_network_vlan_settings
+options:
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    aliases:
+      - name
+      - network
+    description:
+      - Name of a network.
+    type: str
+  state:
+    choices:
+      - present
+      - query
+    description:
+      - Create or modify an alert.
+    type: str
+  vlans_enabled:
+    description:
+      - Whether VLANs are enabled on the network.
+    type: bool
+short_description: Manage VLAN settings for Meraki Networks
 """
 
 EXAMPLES = r"""
diff --git a/plugins/modules/meraki_mx_site_to_site_firewall.py b/plugins/modules/meraki_mx_site_to_site_firewall.py
index 422f523ad..aba48e0d5 100644
--- a/plugins/modules/meraki_mx_site_to_site_firewall.py
+++ b/plugins/modules/meraki_mx_site_to_site_firewall.py
@@ -78,7 +78,7 @@
                 - Whether to log hints against the firewall rule.
                 - Only applicable if a syslog server is specified against the network.
                 type: bool
-                default: False
+                default: false
     syslog_default_rule:
         description:
         - Whether to log hits against the default firewall rule.
@@ -133,7 +133,7 @@
         dest_port: any
         protocol: any
         policy: deny
-    syslog_default_rule: yes
+    syslog_default_rule: true
   delegate_to: localhost
 '''
 
diff --git a/plugins/modules/meraki_mx_static_route.py b/plugins/modules/meraki_mx_static_route.py
index fa906fea7..16cb2dcbf 100644
--- a/plugins/modules/meraki_mx_static_route.py
+++ b/plugins/modules/meraki_mx_static_route.py
@@ -15,96 +15,95 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mx_static_route
-short_description: Manage static routes in the Meraki cloud
-description:
-- Allows for creation, management, and visibility into static routes within Meraki.
-
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_appliance_static_routes
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for creation, management, and visibility into static routes within Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mx_static_route
 options:
-    state:
-        description:
-        - Create or modify an organization.
-        choices: [ absent, query, present ]
-        default: present
-        type: str
-    net_name:
+  enabled:
+    description:
+      - Indicates whether static route is enabled within a network.
+    type: bool
+  fixed_ip_assignments:
+    description:
+      - List of fixed MAC to IP bindings for DHCP.
+    elements: dict
+    suboptions:
+      ip:
         description:
-        - Name of a network.
+          - IP address of endpoint.
         type: str
-    net_id:
+      mac:
         description:
-        - ID number of a network.
+          - MAC address of endpoint.
         type: str
-    name:
+      name:
         description:
-        - Descriptive name of the static route.
+          - Hostname of endpoint.
         type: str
-    subnet:
+    type: list
+  gateway_ip:
+    description:
+      - IP address of the gateway for the subnet.
+    type: str
+  gateway_vlan_id:
+    description:
+      - The gateway IP (next hop) VLAN ID of the static route.
+    type: int
+  name:
+    description:
+      - Descriptive name of the static route.
+    type: str
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    description:
+      - Name of a network.
+    type: str
+  reserved_ip_ranges:
+    description:
+      - List of IP ranges reserved for static IP assignments.
+    elements: dict
+    suboptions:
+      comment:
         description:
-        - CIDR notation based subnet for static route.
+          - Human readable description of reservation range.
         type: str
-    gateway_ip:
+      end:
         description:
-        - IP address of the gateway for the subnet.
+          - Last IP address of reserved range.
         type: str
-    route_id:
+      start:
         description:
-        - Unique ID of static route.
+          - First IP address of reserved range.
         type: str
-    gateway_vlan_id:
-        description:
-        - The gateway IP (next hop) VLAN ID of the static route.
-        type: int
-    fixed_ip_assignments:
-        description:
-        - List of fixed MAC to IP bindings for DHCP.
-        type: list
-        elements: dict
-        suboptions:
-            mac:
-                description:
-                - MAC address of endpoint.
-                type: str
-            ip:
-                description:
-                - IP address of endpoint.
-                type: str
-            name:
-                description:
-                - Hostname of endpoint.
-                type: str
-    reserved_ip_ranges:
-        description:
-        - List of IP ranges reserved for static IP assignments.
-        type: list
-        elements: dict
-        suboptions:
-            start:
-                description:
-                - First IP address of reserved range.
-                type: str
-            end:
-                description:
-                - Last IP address of reserved range.
-                type: str
-            comment:
-                description:
-                - Human readable description of reservation range.
-                type: str
-    enabled:
-        description:
-        - Indicates whether static route is enabled within a network.
-        type: bool
-
-
-author:
-    - Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  route_id:
+    description:
+      - Unique ID of static route.
+    type: str
+  state:
+    choices:
+      - absent
+      - query
+      - present
+    default: present
+    description:
+      - Create or modify an organization.
+    type: str
+  subnet:
+    description:
+      - CIDR notation based subnet for static route.
+    type: str
+short_description: Manage static routes in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -118,7 +117,6 @@
     subnet: 192.0.1.0/24
     gateway_ip: 192.168.128.1
   delegate_to: localhost
-
 - name: Update static route with fixed IP assignment
   meraki_static_route:
     auth_key: abc123
@@ -131,7 +129,6 @@
         ip: 192.0.1.11
         comment: Server
   delegate_to: localhost
-
 - name: Query static routes
   meraki_static_route:
     auth_key: abc123
@@ -139,14 +136,13 @@
     org_name: YourOrg
     net_name: YourNet
   delegate_to: localhost
-
 - name: Delete static routes
   meraki_static_route:
     auth_key: abc123
     state: absent
     org_name: YourOrg
     net_name: YourNet
-    route_id: '{{item}}'
+    route_id: '{{ item }}'
   delegate_to: localhost
 """
 
@@ -185,7 +181,7 @@
       description: Enabled state of static route.
       returned: query or update
       type: bool
-      sample: True
+      sample: true
     reservedIpRanges:
       description: List of IP address ranges which are reserved for static assignment.
       returned: query or update
diff --git a/plugins/modules/meraki_mx_third_party_vpn_peers.py b/plugins/modules/meraki_mx_third_party_vpn_peers.py
index 4bf705572..c4225079a 100644
--- a/plugins/modules/meraki_mx_third_party_vpn_peers.py
+++ b/plugins/modules/meraki_mx_third_party_vpn_peers.py
@@ -15,128 +15,169 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_mx_third_party_vpn_peers
-short_description: Manage third party (IPSec) VPN peers for MX devices
-description:
-- Create, edit, query, or delete third party VPN peers in a Meraki environment.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.organizations_appliance_vpn_third_party_vpnpeers
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Create, edit, query, or delete third party VPN peers in a Meraki environment.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_mx_third_party_vpn_peers
 options:
-    state:
-      description:
-      - Specifies whether object should be queried, created/modified, or removed.
-      choices: [absent, present, query]
-      default: query
-      type: str
-    peers:
-      description:
+  peers:
+    description:
       - The list of VPN peers.
-      type: list
-      elements: dict
-      suboptions:
-        name:
-          description:
-          - The name of the VPN peer.
-          - Required when state is present.
-          type: str
-        public_ip:
-          description:
-          - The public IP of the VPN peer.
-          - Required when state is present.
-          type: str
-        secret:
-          description:
-          - The shared secret with the VPN peer.
-          - Required when state is present.
-          type: str
-        private_subnets:
-          description:
-          - The list of the private subnets of the VPN peer.
-          - Required when state is present.
-          type: list
-          elements: str
-        ike_version:
-          description:
+    elements: dict
+    suboptions:
+      ike_version:
+        choices:
+          - '1'
+          - '2'
+        default: '1'
+        description:
           - The IKE version to be used for the IPsec VPN peer configuration.
-          default: "1"
-          type: str
-          choices: ["1", "2"]
-        ipsec_policies_preset:
-          description:
-          - Specifies IPsec preset values. If this is provided, the 'ipsecPolicies' parameter is ignored.
-          type: str
-          choices: ["default", "aws", "azure"]
-        remote_id:
-          description:
-          - The remote ID is used to identify the connecting VPN peer. This can either be a valid IPv4 Address, FQDN or User FQDN.
-          type: str
-        network_tags:
-          description:
-          - A list of network tags that will connect with this peer. If not included, the default is ['all'].
-          type: list
-          elements: str
-        ipsec_policies:
-          description:
-          - Custom IPSec policies for the VPN peer. If not included and a preset has not been chosen, the default preset for IPSec policies will be used.
-          type: dict
-          suboptions:
-            child_lifetime:
-              description:
-              - The lifetime of the Phase 2 SA in seconds.
-              type: int
-            ike_lifetime:
-              description:
-              - The lifetime of the Phase 1 SA in seconds.
-              type: int
-            child_auth_algo:
-              description:
+        type: str
+      ipsec_policies:
+        description:
+          - Custom IPSec policies for the VPN peer. If not included and a preset has
+            not been chosen, the default preset for IPSec policies will be used.
+        suboptions:
+          child_auth_algo:
+            choices:
+              - sha256
+              - sha1
+              - md5
+            description:
               - This is the authentication algorithms to be used in Phase 2.
-              type: list
-              elements: str
-              choices: ['sha256', 'sha1', 'md5']
-            child_cipher_algo:
-              description:
+            elements: str
+            type: list
+          child_cipher_algo:
+            choices:
+              - aes256
+              - aes192
+              - aes128
+              - tripledes
+              - des
+              - 'null'
+            description:
               - This is the cipher algorithms to be used in Phase 2.
-              choices: ['aes256', 'aes192', 'aes128', 'tripledes', 'des', 'null']
-              type: list
-              elements: str
-            child_pfs_group:
-              description:
-              - This is the Diffie-Hellman group to be used for Perfect Forward Secrecy in Phase 2.
-              type: list
-              elements: str
-              choices: ['disabled','group14', 'group5', 'group2', 'group1']
-            ike_auth_algo:
-              description:
+            elements: str
+            type: list
+          child_lifetime:
+            description:
+              - The lifetime of the Phase 2 SA in seconds.
+            type: int
+          child_pfs_group:
+            choices:
+              - disabled
+              - group14
+              - group5
+              - group2
+              - group1
+            description:
+              - This is the Diffie-Hellman group to be used for Perfect Forward Secrecy
+                in Phase 2.
+            elements: str
+            type: list
+          ike_auth_algo:
+            choices:
+              - sha256
+              - sha1
+              - md5
+            description:
               - This is the authentication algorithm to be used in Phase 1.
-              type: list
-              elements: str
-              choices: ['sha256', 'sha1', 'md5']
-            ike_cipher_algo:
-              description:
+            elements: str
+            type: list
+          ike_cipher_algo:
+            choices:
+              - aes256
+              - aes192
+              - aes128
+              - tripledes
+              - des
+            description:
               - This is the cipher algorithm to be used in Phase 1.
-              type: list
-              elements: str
-              choices: ['aes256', 'aes192', 'aes128', 'tripledes', 'des']
-            ike_diffie_hellman_group:
-              description:
+            elements: str
+            type: list
+          ike_diffie_hellman_group:
+            choices:
+              - group14
+              - group5
+              - group2
+              - group1
+            description:
               - This is the Diffie-Hellman group to be used in Phase 1.
-              type: list
-              elements: str
-              choices: ['group14', 'group5', 'group2', 'group1']
-            ike_prf_algo:
-              description:
+            elements: str
+            type: list
+          ike_lifetime:
+            description:
+              - The lifetime of the Phase 1 SA in seconds.
+            type: int
+          ike_prf_algo:
+            choices:
+              - prfsha256
+              - prfsha1
+              - prfmd5
+              - default
+            description:
               - This is the pseudo-random function to be used in IKE_SA.
-              type: list
-              elements: str
-              choices: ['prfsha256', 'prfsha1', 'prfmd5', 'default']
-
-author:
-- Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+            elements: str
+            type: list
+        type: dict
+      ipsec_policies_preset:
+        choices:
+          - default
+          - aws
+          - azure
+        description:
+          - Specifies IPsec preset values. If this is provided, the 'ipsecPolicies'
+            parameter is ignored.
+        type: str
+      name:
+        description:
+          - The name of the VPN peer.
+          - Required when state is present.
+        type: str
+      network_tags:
+        description:
+          - A list of network tags that will connect with this peer. If not included,
+            the default is ['all'].
+        elements: str
+        type: list
+      private_subnets:
+        description:
+          - The list of the private subnets of the VPN peer.
+          - Required when state is present.
+        elements: str
+        type: list
+      public_ip:
+        description:
+          - The public IP of the VPN peer.
+          - Required when state is present.
+        type: str
+      remote_id:
+        description:
+          - The remote ID is used to identify the connecting VPN peer. This can either
+            be a valid IPv4 Address, FQDN or User FQDN.
+        type: str
+      secret:
+        description:
+          - The shared secret with the VPN peer.
+          - Required when state is present.
+        type: str
+    type: list
+  state:
+    choices:
+      - absent
+      - present
+      - query
+    default: query
+    description:
+      - Specifies whether object should be queried, created/modified, or removed.
+    type: str
+short_description: Manage third party (IPSec) VPN peers for MX devices
 """
 
 EXAMPLES = r"""
@@ -145,40 +186,39 @@
     auth_key: abc123
     state: query
     org_name: orgName
-
 - name: Create VPN peer with an IPsec policy
   meraki_mx_third_party_vpn_peers:
     auth_key: abc123
     state: present
     org_name: orgName
     peers:
-      - name: "Test peer"
-        public_ip: "198.51.100.1"
-        secret: "s3cret"
+      - name: Test peer
+        public_ip: 198.51.100.1
+        secret: s3cret
         private_subnets:
-          - "192.0.2.0/24"
-        ike_version: "2"
+          - 192.0.2.0/24
+        ike_version: '2'
         network_tags:
           - none
-        remote_id: "192.0.2.0"
+        remote_id: 192.0.2.0
         ipsec_policies:
           child_lifetime: 600
           ike_lifetime: 600
           child_auth_algo:
-            - "md5"
+            - md5
           child_cipher_algo:
-            - "tripledes"
-            - "aes192"
+            - tripledes
+            - aes192
           child_pfs_group:
-            - "disabled"
+            - disabled
           ike_auth_algo:
-            - "sha256"
+            - sha256
           ike_cipher_algo:
-            - "tripledes"
+            - tripledes
           ike_diffie_hellman_group:
-            - "group2"
+            - group2
           ike_prf_algo:
-            - "prfmd5"
+            - prfmd5
 """
 
 RETURN = r"""
diff --git a/plugins/modules/meraki_mx_uplink_bandwidth.py b/plugins/modules/meraki_mx_uplink_bandwidth.py
index 8ea8e74be..13102d19c 100644
--- a/plugins/modules/meraki_mx_uplink_bandwidth.py
+++ b/plugins/modules/meraki_mx_uplink_bandwidth.py
@@ -113,10 +113,10 @@
 EXAMPLES = r'''
 - name: Set MX uplink settings
   meraki_mx_uplink_bandwidth:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: present
-    org_name: '{{test_org_name}}'
-    net_name: '{{test_net_name}} - Uplink'
+    org_name: '{{ test_org_name }}'
+    net_name: '{{ test_net_name }} - Uplink'
     wan1:
       bandwidth_limits:
         limit_down: 1000000
@@ -129,12 +129,11 @@
 
 - name: Query MX uplink settings
   meraki_mx_uplink_bandwidth:
-    auth_key: '{{auth_key}}'
+    auth_key: '{{ auth_key }}'
     state: query
-    org_name: '{{test_org_name}}'
-    net_name: '{{test_net_name}} - Uplink'
+    org_name: '{{ test_org_name }}'
+    net_name: '{{ test_net_name }} - Uplink'
   delegate_to: localhost
-
 '''
 
 RETURN = r'''
diff --git a/plugins/modules/meraki_mx_vlan.py b/plugins/modules/meraki_mx_vlan.py
index 320352405..612f423fa 100644
--- a/plugins/modules/meraki_mx_vlan.py
+++ b/plugins/modules/meraki_mx_vlan.py
@@ -333,7 +333,7 @@
       description: Whether DHCP boot options are enabled.
       returned: success
       type: bool
-      sample: no
+      sample: false
     dhcp_boot_next_server:
       description: DHCP boot option to direct boot clients to the server to load the boot file from.
       returned: success
diff --git a/plugins/modules/meraki_network.py b/plugins/modules/meraki_network.py
index cf485c056..722876601 100644
--- a/plugins/modules/meraki_network.py
+++ b/plugins/modules/meraki_network.py
@@ -15,82 +15,96 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_network
-short_description: Manage networks in the Meraki cloud
-description:
-- Allows for creation, management, and visibility into networks within Meraki.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for creation, management, and visibility into networks within Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_network
 options:
-    state:
-        description:
-        - Create or modify an organization.
-        choices: [ absent, present, query ]
-        default: present
-        type: str
-    net_name:
-        description:
-        - Name of a network.
-        aliases: [ name, network ]
-        type: str
-    net_id:
-        description:
-        - ID number of a network.
-        type: str
-    type:
-        description:
-        - Type of network device network manages.
-        - Required when creating a network.
-        - As of Ansible 2.8, C(combined) type is no longer accepted.
-        - As of Ansible 2.8, changes to this parameter are no longer idempotent.
-        choices: [ appliance, switch, wireless, sensor, systemsManager, camera, cellularGateway ]
-        aliases: [ net_type ]
-        type: list
-        elements: str
-    tags:
-        type: list
-        elements: str
-        description:
-        - List of tags to assign to network.
-        - C(tags) name conflicts with the tags parameter in Ansible. Indentation problems may cause unexpected behaviors.
-        - Ansible 2.8 converts this to a list from a comma separated list.
-    timezone:
-        description:
-        - Timezone associated to network.
-        - See U(https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) for a list of valid timezones.
-        type: str
-    enable_vlans:
-        description:
-        - Boolean value specifying whether VLANs should be supported on a network.
-        - Requires C(net_name) or C(net_id) to be specified.
-        type: bool
-    local_status_page_enabled:
-        description: >
-            - This no longer works and will likely be moved to a separate module.
-            - Enables the local device status pages (U[my.meraki.com](my.meraki.com), U[ap.meraki.com](ap.meraki.com), U[switch.meraki.com](switch.meraki.com),
-            U[wired.meraki.com](wired.meraki.com)).
-            - Only can be specified on its own or with C(remote_status_page_enabled).
-        type: bool
-    remote_status_page_enabled:
-        description:
-            - This no longer works and will likely be moved to a separate module.
-            - Enables access to the device status page (U(http://device LAN IP)).
-            - Can only be set if C(local_status_page_enabled:) is set to C(yes).
-            - Only can be specified on its own or with C(local_status_page_enabled).
-        type: bool
-    copy_from_network_id:
-        description:
-            - New network inherits properties from this network ID.
-            - Other provided parameters will override the copied configuration.
-            - Type which must match this network's type exactly.
-        type: str
+  copy_from_network_id:
+    description:
+      - New network inherits properties from this network ID.
+      - Other provided parameters will override the copied configuration.
+      - Type which must match this network's type exactly.
+    type: str
+  enable_vlans:
+    description:
+      - Boolean value specifying whether VLANs should be supported on a network.
+      - Requires C(net_name) or C(net_id) to be specified.
+    type: bool
+  local_status_page_enabled:
+    description: '- This no longer works and will likely be moved to a separate module.
+      - Enables the local device status pages (U[my.meraki.com](my.meraki.com), U[ap.meraki.com](ap.meraki.com),
+      U[switch.meraki.com](switch.meraki.com), U[wired.meraki.com](wired.meraki.com)).
+      - Only can be specified on its own or with C(remote_status_page_enabled).
 
-author:
-    - Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+      '
+    type: bool
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    aliases:
+      - name
+      - network
+    description:
+      - Name of a network.
+    type: str
+  remote_status_page_enabled:
+    description:
+      - This no longer works and will likely be moved to a separate module.
+      - Enables access to the device status page (U(http://device LAN IP)).
+      - Can only be set if C(local_status_page_enabled:) is set to C(yes).
+      - Only can be specified on its own or with C(local_status_page_enabled).
+    type: bool
+  state:
+    choices:
+      - absent
+      - present
+      - query
+    default: present
+    description:
+      - Create or modify an organization.
+    type: str
+  tags:
+    description:
+      - List of tags to assign to network.
+      - C(tags) name conflicts with the tags parameter in Ansible. Indentation problems
+        may cause unexpected behaviors.
+      - Ansible 2.8 converts this to a list from a comma separated list.
+    elements: str
+    type: list
+  timezone:
+    description:
+      - Timezone associated to network.
+      - See U(https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) for a
+        list of valid timezones.
+    type: str
+  type:
+    aliases:
+      - net_type
+    choices:
+      - appliance
+      - switch
+      - wireless
+      - sensor
+      - systemsManager
+      - camera
+      - cellularGateway
+    description:
+      - Type of network device network manages.
+      - Required when creating a network.
+      - As of Ansible 2.8, C(combined) type is no longer accepted.
+      - As of Ansible 2.8, changes to this parameter are no longer idempotent.
+    elements: str
+    type: list
+short_description: Manage networks in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -143,14 +157,14 @@
         state: query
         org_name: YourOrg
         net_name: MyNet
-        enable_vlans: yes
+        enable_vlans: true
     - name: Modify local status page enabled state
       meraki_network:
         auth_key: abc12345
         state: query
         org_name: YourOrg
         net_name: MyNet
-        local_status_page_enabled: yes
+        local_status_page_enabled: true
 """
 
 RETURN = r"""
diff --git a/plugins/modules/meraki_network_settings.py b/plugins/modules/meraki_network_settings.py
index 995bd2196..cae716e46 100644
--- a/plugins/modules/meraki_network_settings.py
+++ b/plugins/modules/meraki_network_settings.py
@@ -15,105 +15,107 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_network_settings
-short_description: Manage the settings of networks in the Meraki cloud
-description:
-- Allows for management of settings of networks within Meraki.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_settings
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for management of settings of networks within Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_network_settings
 options:
-    state:
-        description:
-        - Create or modify an organization.
-        choices: [present, query]
-        type: str
-        default: query
-    net_name:
-        description:
-        - Name of a network.
-        aliases: [ name, network ]
-        type: str
-    net_id:
-        description:
-        - ID number of a network.
-        type: str
-    local_status_page_enabled:
-        description: >
-            - Enables the local device status pages (U[my.meraki.com](my.meraki.com), U[ap.meraki.com](ap.meraki.com), U[switch.meraki.com](switch.meraki.com),
-            U[wired.meraki.com](wired.meraki.com)).
-            - Only can be specified on its own or with C(remote_status_page_enabled).
-        type: bool
-    remote_status_page_enabled:
-        description:
-            - Enables access to the device status page (U(http://device LAN IP)).
-            - Can only be set if C(local_status_page_enabled:) is set to C(yes).
-            - Only can be specified on its own or with C(local_status_page_enabled).
-        type: bool
-    local_status_page:
+  local_status_page:
+    description:
+      - Configuration stanza of the local status page.
+    suboptions:
+      authentication:
         description:
-            - Configuration stanza of the local status page.
-        type: dict
+          - Local status page authentication settings.
         suboptions:
-            authentication:
-                description:
-                    - Local status page authentication settings.
-                type: dict
-                suboptions:
-                    enabled:
-                        description:
-                            - Set whether local status page authentication is enabled.
-                        type: bool
-                    password:
-                        description:
-                            - Set password on local status page.
-                        type: str
-    secure_port:
-        description:
-            - Configuration of SecureConnect options applied to the network.
+          enabled:
+            description:
+              - Set whether local status page authentication is enabled.
+            type: bool
+          password:
+            description:
+              - Set password on local status page.
+            type: str
         type: dict
-        suboptions:
-            enabled:
-                description:
-                    - Set whether SecureConnect is enabled on the network.
-                type: bool
-author:
-    - Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: dict
+  local_status_page_enabled:
+    description: '- Enables the local device status pages (U[my.meraki.com](my.meraki.com),
+      U[ap.meraki.com](ap.meraki.com), U[switch.meraki.com](switch.meraki.com), U[wired.meraki.com](wired.meraki.com)).
+      - Only can be specified on its own or with C(remote_status_page_enabled).
+
+      '
+    type: bool
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    aliases:
+      - name
+      - network
+    description:
+      - Name of a network.
+    type: str
+  remote_status_page_enabled:
+    description:
+      - Enables access to the device status page (U(http://device LAN IP)).
+      - Can only be set if C(local_status_page_enabled:) is set to C(yes).
+      - Only can be specified on its own or with C(local_status_page_enabled).
+    type: bool
+  secure_port:
+    description:
+      - Configuration of SecureConnect options applied to the network.
+    suboptions:
+      enabled:
+        description:
+          - Set whether SecureConnect is enabled on the network.
+        type: bool
+    type: dict
+  state:
+    choices:
+      - present
+      - query
+    default: query
+    description:
+      - Create or modify an organization.
+    type: str
+short_description: Manage the settings of networks in the Meraki cloud
 """
 
 EXAMPLES = r"""
-  - name: Get network settings
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-    delegate_to: localhost
-
-  - name: Update network settings
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: false
-    delegate_to: localhost
-
-  - name: Enable password on local page
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: true
-      local_status_page:
-        authentication:
-          enabled: true
-          password: abc123
-    delegate_to: localhost
+- name: Get network settings
+  cisco.meraki.meraki_network_settings:
+    auth_key: '{{ auth_key }}'
+    state: query
+    org_name: '{{ test_org_name }}'
+    net_name: NetworkSettingsTestNet
+  delegate_to: localhost
+- name: Update network settings
+  cisco.meraki.meraki_network_settings:
+    auth_key: '{{ auth_key }}'
+    state: present
+    org_name: '{{ test_org_name }}'
+    net_name: NetworkSettingsTestNet
+    local_status_page_enabled: false
+  delegate_to: localhost
+- name: Enable password on local page
+  cisco.meraki.meraki_network_settings:
+    auth_key: '{{ auth_key }}'
+    state: present
+    org_name: '{{ test_org_name }}'
+    net_name: NetworkSettingsTestNet
+    local_status_page_enabled: true
+    local_status_page:
+      authentication:
+        enabled: true
+        password: abc123
+  delegate_to: localhost
 """
 
 RETURN = r"""
diff --git a/plugins/modules/meraki_snmp.py b/plugins/modules/meraki_snmp.py
index 52d4dbbbb..c7bf229e1 100644
--- a/plugins/modules/meraki_snmp.py
+++ b/plugins/modules/meraki_snmp.py
@@ -112,7 +112,7 @@
     auth_key: abc12345
     org_name: YourOrg
     state: present
-    v2c_enabled: yes
+    v2c_enabled: true
   delegate_to: localhost
 
 - name: Disable SNMPv2
@@ -120,7 +120,7 @@
     auth_key: abc12345
     org_name: YourOrg
     state: present
-    v2c_enabled: no
+    v2c_enabled: false
   delegate_to: localhost
 
 - name: Enable SNMPv3
diff --git a/plugins/modules/meraki_syslog.py b/plugins/modules/meraki_syslog.py
index 656b06cac..3aca67390 100644
--- a/plugins/modules/meraki_syslog.py
+++ b/plugins/modules/meraki_syslog.py
@@ -15,64 +15,69 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_syslog
-short_description: Manage syslog server settings in the Meraki cloud.
-description:
-- Allows for creation and management of Syslog servers within Meraki.
-notes:
-- Changes to existing syslog servers replaces existing configuration. If you need to add to an
-  existing configuration set state to query to gather the existing configuration and then modify or add.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_syslog_servers
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for creation and management of Syslog servers within Meraki.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_syslog
+notes:
+  - Changes to existing syslog servers replaces existing configuration. If you need
+    to add to an existing configuration set state to query to gather the existing
+    configuration and then modify or add.
 options:
-    auth_key:
+  auth_key:
+    description:
+      - Authentication key provided by the dashboard. Required if environmental variable
+        MERAKI_KEY is not set.
+    type: str
+  net_id:
+    description:
+      - ID number of a network.
+    type: str
+  net_name:
+    aliases:
+      - name
+      - network
+    description:
+      - Name of a network.
+    type: str
+  servers:
+    description:
+      - List of syslog server settings
+    elements: dict
+    suboptions:
+      host:
         description:
-        - Authentication key provided by the dashboard. Required if environmental variable MERAKI_KEY is not set.
+          - IP address or hostname of Syslog server.
         type: str
-    state:
+      port:
+        default: '514'
         description:
-        - Query or edit syslog servers
-        - To delete a syslog server, do not include server in list of servers
-        choices: [present, query]
-        default: present
-        type: str
-    net_name:
+          - Port number Syslog server is listening on.
+        type: int
+      roles:
         description:
-        - Name of a network.
-        aliases: [name, network]
-        type: str
-    net_id:
-        description:
-        - ID number of a network.
-        type: str
-    servers:
-        description:
-        - List of syslog server settings
+          - List of applicable Syslog server roles.
+          - Choices can be one of Wireless Event log, Appliance event log, Switch
+            event log, Air Marshal events, Flows, URLs, IDS alerts, Security events
+        elements: str
         type: list
-        elements: dict
-        suboptions:
-            host:
-                description:
-                - IP address or hostname of Syslog server.
-                type: str
-            port:
-                description:
-                - Port number Syslog server is listening on.
-                default: "514"
-                type: int
-            roles:
-                description:
-                - List of applicable Syslog server roles.
-                - Choices can be one of Wireless Event log, Appliance event log, Switch event log, Air Marshal events, Flows, URLs, IDS alerts, Security events
-                type: list
-                elements: str
-
-author:
-    - Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  state:
+    choices:
+      - present
+      - query
+    default: present
+    description:
+      - Query or edit syslog servers
+      - To delete a syslog server, do not include server in list of servers
+    type: str
+short_description: Manage syslog server settings in the Meraki cloud.
 """
 
 EXAMPLES = r"""
@@ -83,7 +88,6 @@
     org_name: YourOrg
     net_name: MyNet
   delegate_to: localhost
-
 - name: Add single syslog server with Appliance event log role
   meraki_syslog:
     auth_key: abc12345
@@ -96,7 +100,6 @@
         roles:
           - Appliance event log
   delegate_to: localhost
-
 - name: Add multiple syslog servers
   meraki_syslog:
     auth_key: abc12345
diff --git a/plugins/modules/meraki_webhook.py b/plugins/modules/meraki_webhook.py
index 539c56ec0..e79e38c65 100644
--- a/plugins/modules/meraki_webhook.py
+++ b/plugins/modules/meraki_webhook.py
@@ -15,69 +15,74 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_webhook
-short_description: Manage webhooks configured in the Meraki cloud
-description:
-- Configure and query information about webhooks within the Meraki cloud.
-notes:
-- Some of the options are likely only used for developers within Meraki.
+author:
+  - Kevin Breit (@kbreit)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_webhooks_http_servers
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Configure and query information about webhooks within the Meraki cloud.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_webhook
+notes:
+  - Some of the options are likely only used for developers within Meraki.
 options:
-    state:
-      description:
-      - Specifies whether object should be queried, created/modified, or removed.
-      choices: [absent, present, query]
-      default: query
-      type: str
-    net_name:
-      description:
-      - Name of network which configuration is applied to.
-      aliases: [network]
-      type: str
-    net_id:
-      description:
-      - ID of network which configuration is applied to.
-      type: str
-    name:
-      description:
+  name:
+    description:
       - Name of webhook.
-      type: str
-    shared_secret:
-      description:
-      - Secret password to use when accessing webhook.
-      type: str
-    url:
-      description:
-      - URL to access when calling webhook.
-      type: str
-    webhook_id:
-      description:
-      - Unique ID of webhook.
-      type: str
-    payload_template_name:
-      description:
+    type: str
+  net_id:
+    description:
+      - ID of network which configuration is applied to.
+    type: str
+  net_name:
+    aliases:
+      - network
+    description:
+      - Name of network which configuration is applied to.
+    type: str
+  payload_template_id:
+    description:
+      - The ID of the payload template. Overrides payload_template_name if passed
+        too.
+    type: str
+  payload_template_name:
+    description:
       - The name of the payload template
-      type: str
-    payload_template_id:
-      description:
-      - The ID of the payload template. Overrides payload_template_name if passed too.
-      type: str
-    test:
-      description:
+    type: str
+  shared_secret:
+    description:
+      - Secret password to use when accessing webhook.
+    type: str
+  state:
+    choices:
+      - absent
+      - present
+      - query
+    default: query
+    description:
+      - Specifies whether object should be queried, created/modified, or removed.
+    type: str
+  test:
+    choices:
+      - test
+    description:
       - Indicates whether to test or query status.
-      type: str
-      choices: [test]
-    test_id:
-      description:
+    type: str
+  test_id:
+    description:
       - ID of webhook test query.
-      type: str
-author:
-- Kevin Breit (@kbreit)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: str
+  url:
+    description:
+      - URL to access when calling webhook.
+    type: str
+  webhook_id:
+    description:
+      - Unique ID of webhook.
+    type: str
+short_description: Manage webhooks configured in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -90,9 +95,8 @@
     name: Test_Hook
     url: https://webhook.url/
     shared_secret: shhhdonttellanyone
-    payload_template_name: 'Slack (included)'
+    payload_template_name: Slack (included)
   delegate_to: localhost
-
 - name: Query one webhook
   meraki_webhook:
     auth_key: abc123
@@ -101,7 +105,6 @@
     net_name: YourNet
     name: Test_Hook
   delegate_to: localhost
-
 - name: Query all webhooks
   meraki_webhook:
     auth_key: abc123
@@ -109,7 +112,6 @@
     org_name: YourOrg
     net_name: YourNet
   delegate_to: localhost
-
 - name: Delete webhook
   meraki_webhook:
     auth_key: abc123
@@ -118,7 +120,6 @@
     net_name: YourNet
     name: Test_Hook
   delegate_to: localhost
-
 - name: Test webhook
   meraki_webhook:
     auth_key: abc123
@@ -128,7 +129,6 @@
     test: test
     url: https://webhook.url/abc123
   delegate_to: localhost
-
 - name: Get webhook status
   meraki_webhook:
     auth_key: abc123
diff --git a/plugins/modules/meraki_webhook_payload_template.py b/plugins/modules/meraki_webhook_payload_template.py
index bcaf270fa..e87c1daa3 100644
--- a/plugins/modules/meraki_webhook_payload_template.py
+++ b/plugins/modules/meraki_webhook_payload_template.py
@@ -15,56 +15,59 @@
 }
 
 DOCUMENTATION = r"""
----
-module: meraki_webhook_payload_template
-short_description: Manage webhook payload templates for a network in the Meraki cloud
-description:
-- Allows for querying, deleting, creating, and updating of webhook payload templates.
+author:
+  - Joshua Coronado (@joshuajcoronado)
 deprecated:
-  removed_in: '3.0.0'
-  why: Updated modules released with increased functionality
   alternative: cisco.meraki.networks_webhooks_payload_templates
+  removed_in: 3.0.0
+  why: Updated modules released with increased functionality
+description:
+  - Allows for querying, deleting, creating, and updating of webhook payload templates.
+extends_documentation_fragment: cisco.meraki.meraki
+module: meraki_webhook_payload_template
 options:
-    state:
+  body:
+    description:
+      - The liquid template used for the body of the webhook message.
+    type: str
+  headers:
+    default: []
+    description:
+      - List of the liquid templates used with the webhook headers.
+    elements: dict
+    suboptions:
+      name:
         description:
-        - Specifies whether payload template should be queried, created, modified, or deleted.
-        choices: ['absent', 'query', 'present']
-        default: query
+          - The name of the header template.
         type: str
-    name:
+      template:
         description:
-        - Name of the template.
+          - The liquid template for the headers
         type: str
-    net_name:
-        description:
-        - Name of network containing access points.
-        type: str
-    net_id:
-        description:
-        - ID of network containing access points.
-        type: str
-    body:
-        description:
-        - The liquid template used for the body of the webhook message.
-        type: str
-    headers:
-        description:
-        - List of the liquid templates used with the webhook headers.
-        type: list
-        elements: dict
-        default: []
-        suboptions:
-            name:
-                description:
-                - The name of the header template.
-                type: str
-            template:
-                description:
-                - The liquid template for the headers
-                type: str
-author:
-- Joshua Coronado (@joshuajcoronado)
-extends_documentation_fragment: cisco.meraki.meraki
+    type: list
+  name:
+    description:
+      - Name of the template.
+    type: str
+  net_id:
+    description:
+      - ID of network containing access points.
+    type: str
+  net_name:
+    description:
+      - Name of network containing access points.
+    type: str
+  state:
+    choices:
+      - absent
+      - query
+      - present
+    default: query
+    description:
+      - Specifies whether payload template should be queried, created, modified, or
+        deleted.
+    type: str
+short_description: Manage webhook payload templates for a network in the Meraki cloud
 """
 
 EXAMPLES = r"""
@@ -74,7 +77,6 @@
     org_name: YourOrg
     state: query
   delegate_to: localhost
-
 - name: Query specific configuration templates
   meraki_webhook_payload_template:
     auth_key: abc12345
@@ -82,7 +84,6 @@
     state: query
     name: Twitter
   delegate_to: localhost
-
 - name: Create payload template
   meraki_webhook_payload_template:
     auth_key: abc12345
@@ -91,10 +92,9 @@
     name: TestTemplate
     body: Testbody
     headers:
-        - name: testheader
-          template: testheadertemplate
+      - name: testheader
+        template: testheadertemplate
   delegate_to: localhost
-
 - name: Delete a configuration template
   meraki_config_template:
     auth_key: abc123
@@ -121,7 +121,7 @@
                 - The liquid template used for the body of the webhook message.
             returned: success
             type: str
-            sample: {"event_type":"{{alertTypeId}}","client_payload":{"text":"{{alertData}}"}}
+            sample: {"event_type":"{{ alertTypeId }}","client_payload":{"text":"{{ alertData }}"}}
         headers:
             description: List of the liquid templates used with the webhook headers.
             returned: success
@@ -138,7 +138,7 @@
                         - The liquid template for the header
                     returned: success
                     type: str
-                    sample: "Bearer {{sharedSecret}}"
+                    sample: "Bearer {{ sharedSecret }}"
 """
 
 from ansible.module_utils.basic import AnsibleModule, json
diff --git a/plugins/modules/networks.py b/plugins/modules/networks.py
index b81eead05..06319cf9e 100644
--- a/plugins/modules/networks.py
+++ b/plugins/modules/networks.py
@@ -5,23 +5,25 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks
-short_description: Resource module for networks
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks.
-- Create a network.
-- Delete a network.
-- Update a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks.
+  - Create a network.
+  - Delete a network.
+  - Update a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks
+notes:
+  - SDK Method used are networks.Networks.create_organization_network, networks.Networks.delete_network,
+    networks.Networks.update_network,
+  - Paths used are post /organizations/{organizationId}/networks, delete /networks/{networkId},
+    put /networks/{networkId},
 options:
   copyFromNetworkId:
-    description: The ID of the network to copy configuration from. Other provided parameters
-      will override the copied configuration, except type which must match this network's
-      type exactly.
+    description: The ID of the network to copy configuration from. Other provided
+      parameters will override the copied configuration, except type which must match
+      this network's type exactly.
     type: str
   enrollmentString:
     description: A unique identifier which can be used for device enrollment or easy
@@ -41,8 +43,8 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
   productTypes:
-    description: The product type(s) of the new network. If more than one type is included,
-      the network will be a combined network.
+    description: The product type(s) of the new network. If more than one type is
+      included, the network will be a combined network.
     elements: str
     type: list
   tags:
@@ -55,124 +57,113 @@
       article.</a>.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createOrganizationNetwork
-  description: Complete reference of the createOrganizationNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-network
-- name: Cisco Meraki documentation for networks deleteNetwork
-  description: Complete reference of the deleteNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network
-- name: Cisco Meraki documentation for networks updateNetwork
-  description: Complete reference of the updateNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network
-notes:
-  - SDK Method used are
-    networks.Networks.create_organization_network,
-    networks.Networks.delete_network,
-    networks.Networks.update_network,
-
-  - Paths used are
-    post /organizations/{organizationId}/networks,
-    delete /networks/{networkId},
-    put /networks/{networkId},
+  - description: Complete reference of the createOrganizationNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-network
+    name: Cisco Meraki documentation for networks createOrganizationNetwork
+  - description: Complete reference of the deleteNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network
+    name: Cisco Meraki documentation for networks deleteNetwork
+  - description: Complete reference of the updateNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network
+    name: Cisco Meraki documentation for networks updateNetwork
+short_description: Resource module for networks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Delete by id
   cisco.meraki.networks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enrollmentString: my-enrollment-string
     name: Main Office
     networkId: string
     notes: Additional description of the network
     tags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     timeZone: America/Los_Angeles
-
 - name: Create
   cisco.meraki.networks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     copyFromNetworkId: N_24329156
     name: Main Office
     notes: Additional description of the network
     organizationId: string
     productTypes:
-    - appliance
-    - switch
-    - wireless
+      - appliance
+      - switch
+      - wireless
     tags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     timeZone: America/Los_Angeles
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_alerts_history_info.py b/plugins/modules/networks_alerts_history_info.py
index f1fba6042..48f67d851 100644
--- a/plugins/modules/networks_alerts_history_info.py
+++ b/plugins/modules/networks_alerts_history_info.py
@@ -5,81 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_alerts_history_info
-short_description: Information module for networks _alerts _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _alerts _history.
-- Return the alert history for this network.
-version_added: '2.16.0'
+  - Get all networks _alerts _history.
+  - Return the alert history for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_alerts_history_info
+notes:
+  - SDK Method used are networks.Networks.get_network_alerts_history,
+  - Paths used are get /networks/{networkId}/alerts/history,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 100.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkAlertsHistory
-  description: Complete reference of the getNetworkAlertsHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-alerts-history
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_alerts_history,
-
-  - Paths used are
-    get /networks/{networkId}/alerts/history,
+  - description: Complete reference of the getNetworkAlertsHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-alerts-history
+    name: Cisco Meraki documentation for networks getNetworkAlertsHistory
+short_description: Information module for networks _alerts _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _alerts _history
   cisco.meraki.networks_alerts_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +90,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_alerts_settings.py b/plugins/modules/networks_alerts_settings.py
index 853d97042..23beddbf8 100644
--- a/plugins/modules/networks_alerts_settings.py
+++ b/plugins/modules/networks_alerts_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_alerts_settings
-short_description: Resource module for networks _alerts _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _alerts _settings.
-- Update the alert configuration for this network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _alerts _settings.
+  - Update the alert configuration for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_alerts_settings
+notes:
+  - SDK Method used are networks.Networks.update_network_alerts_settings,
+  - Paths used are put /networks/{networkId}/alerts/settings,
 options:
   alerts:
     description: Alert-specific configuration for each type. Only alerts that pertain
@@ -25,11 +25,12 @@
         description: A hash of destinations for this specific alert.
         suboptions:
           allAdmins:
-            description: If true, then all network admins will receive emails for this
-              alert.
+            description: If true, then all network admins will receive emails for
+              this alert.
             type: bool
           emails:
-            description: A list of emails that will receive information about the alert.
+            description: A list of emails that will receive information about the
+              alert.
             elements: str
             type: list
           httpServerIds:
@@ -42,8 +43,8 @@
             elements: str
             type: list
           snmp:
-            description: If true, then an SNMP trap will be sent for this alert if there
-              is an SNMP trap server configured for this network.
+            description: If true, then an SNMP trap will be sent for this alert if
+              there is an SNMP trap server configured for this network.
             type: bool
         type: dict
       enabled:
@@ -153,91 +154,86 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkAlertsSettings
-  description: Complete reference of the updateNetworkAlertsSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-alerts-settings
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_alerts_settings,
-
-  - Paths used are
-    put /networks/{networkId}/alerts/settings,
+  - description: Complete reference of the updateNetworkAlertsSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-alerts-settings
+    name: Cisco Meraki documentation for networks updateNetworkAlertsSettings
+short_description: Resource module for networks _alerts _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_alerts_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     alerts:
-    - alertDestinations:
-        allAdmins: false
-        emails:
-        - miles@meraki.com
-        httpServerIds:
-        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
-        smsNumbers:
-        - '+15555555555'
-        snmp: false
-      enabled: true
-      filters:
-        conditions:
-        - direction: +
-          duration: 0
-          threshold: 72.5
-          type: temperature
-          unit: celsius
-        failureType: 802.1X auth fail
-        lookbackWindow: 360
-        minDuration: 60
-        name: Filter
-        period: 1800
-        priority: ''
-        regex: '[a-z]'
-        selector: '{"smartSensitivity":"medium","smartEnabled":false,"eventReminderPeriodSecs":10800}'
-        serials:
-        - Q234-ABCD-0001
-        - Q234-ABCD-0002
-        - Q234-ABCD-0003
-        ssidNum: 1
-        tag: tag1
-        threshold: 30
-        timeout: 60
-      type: gatewayDown
+      - alertDestinations:
+          allAdmins: false
+          emails:
+            - miles@meraki.com
+          httpServerIds:
+            - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
+          smsNumbers:
+            - '+15555555555'
+          snmp: false
+        enabled: true
+        filters:
+          conditions:
+            - direction: +
+              duration: 0
+              threshold: 72.5
+              type: temperature
+              unit: celsius
+          failureType: 802.1X auth fail
+          lookbackWindow: 360
+          minDuration: 60
+          name: Filter
+          period: 1800
+          priority: ''
+          regex: '[a-z]'
+          selector: '{"smartSensitivity":"medium","smartEnabled":false,"eventReminderPeriodSecs":10800}'
+          serials:
+            - Q234-ABCD-0001
+            - Q234-ABCD-0002
+            - Q234-ABCD-0003
+          ssidNum: 1
+          tag: tag1
+          threshold: 30
+          timeout: 60
+        type: gatewayDown
     defaultDestinations:
       allAdmins: true
       emails:
-      - miles@meraki.com
+        - miles@meraki.com
       httpServerIds:
-      - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
+        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
       snmp: true
     muting:
       byPortSchedules:
         enabled: true
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_alerts_settings_info.py b/plugins/modules/networks_alerts_settings_info.py
index 3d9ab5b1a..45d0281a8 100644
--- a/plugins/modules/networks_alerts_settings_info.py
+++ b/plugins/modules/networks_alerts_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_alerts_settings_info
-short_description: Information module for networks _alerts _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _alerts _settings.
-- Return the alert configuration for this network.
-version_added: '2.16.0'
+  - Get all networks _alerts _settings.
+  - Return the alert configuration for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_alerts_settings_info
+notes:
+  - SDK Method used are networks.Networks.get_network_alerts_settings,
+  - Paths used are get /networks/{networkId}/alerts/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkAlertsSettings
-  description: Complete reference of the getNetworkAlertsSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-alerts-settings
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_alerts_settings,
-
-  - Paths used are
-    get /networks/{networkId}/alerts/settings,
+  - description: Complete reference of the getNetworkAlertsSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-alerts-settings
+    name: Cisco Meraki documentation for networks getNetworkAlertsSettings
+short_description: Information module for networks _alerts _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _alerts _settings
   cisco.meraki.networks_alerts_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_connectivity_monitoring_destinations.py b/plugins/modules/networks_appliance_connectivity_monitoring_destinations.py
index c161a2403..cdcbd72df 100644
--- a/plugins/modules/networks_appliance_connectivity_monitoring_destinations.py
+++ b/plugins/modules/networks_appliance_connectivity_monitoring_destinations.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_connectivity_monitoring_destinations
-short_description: Resource module for networks _appliance _connectivity _monitoring _destinations
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _connectivity _monitoring _destinations.
-- Update the connectivity testing destinations for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _connectivity _monitoring
+    _destinations.
+  - Update the connectivity testing destinations for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_connectivity_monitoring_destinations
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_connectivity_monitoring_destinations,
+  - Paths used are put /networks/{networkId}/appliance/connectivityMonitoringDestinations,
 options:
   destinations:
     description: The list of connectivity monitoring destinations.
@@ -25,7 +26,8 @@
           (true) or not (false). Defaults to false. Only one default is allowed.
         type: bool
       description:
-        description: Description of the testing destination. Optional, defaults to null.
+        description: Description of the testing destination. Optional, defaults to
+          null.
         type: str
       ip:
         description: The IP address to test connectivity with.
@@ -35,50 +37,47 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceConnectivityMonitoringDestinations
-  description: Complete reference of the updateNetworkApplianceConnectivityMonitoringDestinations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-connectivity-monitoring-destinations
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_connectivity_monitoring_destinations,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/connectivityMonitoringDestinations,
+  - description: Complete reference of the updateNetworkApplianceConnectivityMonitoringDestinations
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-connectivity-monitoring-destinations
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceConnectivityMonitoringDestinations
+short_description: Resource module for networks _appliance _connectivity _monitoring
+  _destinations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_connectivity_monitoring_destinations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     destinations:
-    - default: false
-      description: Google
-      ip: 1.2.3.4
+      - default: false
+        description: Google
+        ip: 1.2.3.4
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_connectivity_monitoring_destinations_info.py b/plugins/modules/networks_appliance_connectivity_monitoring_destinations_info.py
index 597431f72..0d8e048a9 100644
--- a/plugins/modules/networks_appliance_connectivity_monitoring_destinations_info.py
+++ b/plugins/modules/networks_appliance_connectivity_monitoring_destinations_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_connectivity_monitoring_destinations_info
-short_description: Information module for networks _appliance _connectivity _monitoring _destinations
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _connectivity _monitoring _destinations.
-- Return the connectivity testing destinations for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _connectivity _monitoring _destinations.
+  - Return the connectivity testing destinations for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_connectivity_monitoring_destinations_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_connectivity_monitoring_destinations,
+  - Paths used are get /networks/{networkId}/appliance/connectivityMonitoringDestinations,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceConnectivityMonitoringDestinations
-  description: Complete reference of the getNetworkApplianceConnectivityMonitoringDestinations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-connectivity-monitoring-destinations
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_connectivity_monitoring_destinations,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/connectivityMonitoringDestinations,
+  - description: Complete reference of the getNetworkApplianceConnectivityMonitoringDestinations
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-connectivity-monitoring-destinations
+    name: Cisco Meraki documentation for appliance getNetworkApplianceConnectivityMonitoringDestinations
+short_description: Information module for networks _appliance _connectivity _monitoring
+  _destinations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _connectivity _monitoring _destinations
   cisco.meraki.networks_appliance_connectivity_monitoring_destinations_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_content_filtering.py b/plugins/modules/networks_appliance_content_filtering.py
index 53b3a4f39..b746747f1 100644
--- a/plugins/modules/networks_appliance_content_filtering.py
+++ b/plugins/modules/networks_appliance_content_filtering.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_content_filtering
-short_description: Resource module for networks _appliance _content _filtering
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _content _filtering.
-- Update the content filtering settings for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _content _filtering.
+  - Update the content filtering settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_content_filtering
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_content_filtering,
+  - Paths used are put /networks/{networkId}/appliance/contentFiltering,
 options:
   allowedUrlPatterns:
     description: A list of URL patterns that are allowed.
@@ -35,56 +35,52 @@
     description: URL category list size which is either 'topSites' or 'fullList'.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceContentFiltering
-  description: Complete reference of the updateNetworkApplianceContentFiltering API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-content-filtering
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_content_filtering,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/contentFiltering,
+  - description: Complete reference of the updateNetworkApplianceContentFiltering
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-content-filtering
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceContentFiltering
+short_description: Resource module for networks _appliance _content _filtering
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_content_filtering:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     allowedUrlPatterns:
-    - http://www.example.org
-    - http://help.com.au
+      - http://www.example.org
+      - http://help.com.au
     blockedUrlCategories:
-    - meraki:contentFiltering/category/1
-    - meraki:contentFiltering/category/7
+      - meraki:contentFiltering/category/1
+      - meraki:contentFiltering/category/7
     blockedUrlPatterns:
-    - http://www.example.com
-    - http://www.betting.com
+      - http://www.example.com
+      - http://www.betting.com
     networkId: string
     urlCategoryListSize: topSites
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_content_filtering_categories_info.py b/plugins/modules/networks_appliance_content_filtering_categories_info.py
index 07ccad788..5a57a9b1f 100644
--- a/plugins/modules/networks_appliance_content_filtering_categories_info.py
+++ b/plugins/modules/networks_appliance_content_filtering_categories_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_content_filtering_categories_info
-short_description: Information module for networks _appliance _content _filtering _categories
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _content _filtering _categories.
-- List all available content filtering categories for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _content _filtering _categories.
+  - List all available content filtering categories for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_content_filtering_categories_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_content_filtering_categories,
+  - Paths used are get /networks/{networkId}/appliance/contentFiltering/categories,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceContentFilteringCategories
-  description: Complete reference of the getNetworkApplianceContentFilteringCategories API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-content-filtering-categories
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_content_filtering_categories,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/contentFiltering/categories,
+  - description: Complete reference of the getNetworkApplianceContentFilteringCategories
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-content-filtering-categories
+    name: Cisco Meraki documentation for appliance getNetworkApplianceContentFilteringCategories
+short_description: Information module for networks _appliance _content _filtering
+  _categories
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _content _filtering _categories
   cisco.meraki.networks_appliance_content_filtering_categories_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_content_filtering_info.py b/plugins/modules/networks_appliance_content_filtering_info.py
index 818219d61..816d34bdc 100644
--- a/plugins/modules/networks_appliance_content_filtering_info.py
+++ b/plugins/modules/networks_appliance_content_filtering_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_content_filtering_info
-short_description: Information module for networks _appliance _content _filtering
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _content _filtering.
-- Return the content filtering settings for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _content _filtering.
+  - Return the content filtering settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_content_filtering_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_content_filtering,
+  - Paths used are get /networks/{networkId}/appliance/contentFiltering,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceContentFiltering
-  description: Complete reference of the getNetworkApplianceContentFiltering API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-content-filtering
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_content_filtering,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/contentFiltering,
+  - description: Complete reference of the getNetworkApplianceContentFiltering API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-content-filtering
+    name: Cisco Meraki documentation for appliance getNetworkApplianceContentFiltering
+short_description: Information module for networks _appliance _content _filtering
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _content _filtering
   cisco.meraki.networks_appliance_content_filtering_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_cellular_firewall_rules.py b/plugins/modules/networks_appliance_firewall_cellular_firewall_rules.py
index 44c466c26..f76077d9c 100644
--- a/plugins/modules/networks_appliance_firewall_cellular_firewall_rules.py
+++ b/plugins/modules/networks_appliance_firewall_cellular_firewall_rules.py
@@ -5,30 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_cellular_firewall_rules
-short_description: Resource module for networks _appliance _firewall _cellular _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _cellular _firewall _rules.
-- Update the cellular firewall rules of an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _cellular
+    _firewall _rules.
+  - Update the cellular firewall rules of an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_cellular_firewall_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_cellular_firewall_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/cellularFirewallRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
   rules:
-    description: An ordered array of the firewall rules (not including the default rule).
+    description: An ordered array of the firewall rules (not including the default
+      rule).
     elements: dict
     suboptions:
       comment:
         description: Description of the rule (optional).
         type: str
       destCidr:
-        description: Comma-separated list of destination IP address(es) (in IP or CIDR
-          notation), fully-qualified domain names (FQDN) or 'any'.
+        description: Comma-separated list of destination IP address(es) (in IP or
+          CIDR notation), fully-qualified domain names (FQDN) or 'any'.
         type: str
       destPort:
         description: Comma-separated list of destination port(s) (integer in the range
@@ -42,68 +44,65 @@
           'any').
         type: str
       srcCidr:
-        description: Comma-separated list of source IP address(es) (in IP or CIDR notation),
-          or 'any' (note FQDN not supported for source addresses).
+        description: Comma-separated list of source IP address(es) (in IP or CIDR
+          notation), or 'any' (note FQDN not supported for source addresses).
         type: str
       srcPort:
-        description: Comma-separated list of source port(s) (integer in the range 1-65535),
-          or 'any'.
+        description: Comma-separated list of source port(s) (integer in the range
+          1-65535), or 'any'.
         type: str
       syslogEnabled:
-        description: Log this rule to syslog (true or false, boolean value) - only applicable
-          if a syslog has been configured (optional).
+        description: Log this rule to syslog (true or false, boolean value) - only
+          applicable if a syslog has been configured (optional).
         type: bool
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallCellularFirewallRules
-  description: Complete reference of the updateNetworkApplianceFirewallCellularFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-cellular-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_cellular_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/cellularFirewallRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallCellularFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-cellular-firewall-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallCellularFirewallRules
+short_description: Resource module for networks _appliance _firewall _cellular _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_cellular_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - comment: Allow TCP traffic to subnet with HTTP servers.
-      destCidr: 192.168.1.0/24
-      destPort: '443'
-      policy: allow
-      protocol: tcp
-      srcCidr: Any
-      srcPort: Any
-      syslogEnabled: false
-
+      - comment: Allow TCP traffic to subnet with HTTP servers.
+        destCidr: 192.168.1.0/24
+        destPort: '443'
+        policy: allow
+        protocol: tcp
+        srcCidr: Any
+        srcPort: Any
+        syslogEnabled: false
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_cellular_firewall_rules_info.py b/plugins/modules/networks_appliance_firewall_cellular_firewall_rules_info.py
index a77705f25..6e790cf56 100644
--- a/plugins/modules/networks_appliance_firewall_cellular_firewall_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_cellular_firewall_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_cellular_firewall_rules_info
-short_description: Information module for networks _appliance _firewall _cellular _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _cellular _firewall _rules.
-- Return the cellular firewall rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _cellular _firewall _rules.
+  - Return the cellular firewall rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_cellular_firewall_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_cellular_firewall_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/cellularFirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallCellularFirewallRules
-  description: Complete reference of the getNetworkApplianceFirewallCellularFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-cellular-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_cellular_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/cellularFirewallRules,
+  - description: Complete reference of the getNetworkApplianceFirewallCellularFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-cellular-firewall-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallCellularFirewallRules
+short_description: Information module for networks _appliance _firewall _cellular
+  _firewall _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _cellular _firewall _rules
   cisco.meraki.networks_appliance_firewall_cellular_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_firewalled_services.py b/plugins/modules/networks_appliance_firewall_firewalled_services.py
index 89e7351e2..b86aa7b16 100644
--- a/plugins/modules/networks_appliance_firewall_firewalled_services.py
+++ b/plugins/modules/networks_appliance_firewall_firewalled_services.py
@@ -5,22 +5,24 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_firewalled_services
-short_description: Resource module for networks _appliance _firewall _firewalled _services
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _firewalled _services.
-- Updates the accessibility settings for the given service 'ICMP', 'web', or 'SNMP' .
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _firewalled
+    _services.
+  - Updates the accessibility settings for the given service 'ICMP', 'web', or 'SNMP'
+    .
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_firewalled_services
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_firewalled_service,
+  - Paths used are put /networks/{networkId}/appliance/firewall/firewalledServices/{service},
 options:
   access:
-    description: A string indicating the rule for which IPs are allowed to use the specified
-      service. Acceptable values are "blocked" (no remote IPs can access the service),
-      "restricted" (only allowed IPs can access the service), and "unrestriced" (any
-      remote IP can access the service). This field is required.
+    description: A string indicating the rule for which IPs are allowed to use the
+      specified service. Acceptable values are "blocked" (no remote IPs can access
+      the service), "restricted" (only allowed IPs can access the service), and "unrestriced"
+      (any remote IP can access the service). This field is required.
     type: str
   allowedIps:
     description: An array of allowed IPs that can access the service. This field is
@@ -34,50 +36,46 @@
     description: Service path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallFirewalledService
-  description: Complete reference of the updateNetworkApplianceFirewallFirewalledService API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-firewalled-service
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_firewalled_service,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/firewalledServices/{service},
+  - description: Complete reference of the updateNetworkApplianceFirewallFirewalledService
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-firewalled-service
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallFirewalledService
+short_description: Resource module for networks _appliance _firewall _firewalled _services
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_appliance_firewall_firewalled_services:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     access: restricted
     allowedIps:
-    - 123.123.123.1
+      - 123.123.123.1
     networkId: string
     service: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_firewalled_services_info.py b/plugins/modules/networks_appliance_firewall_firewalled_services_info.py
index a73fff0b7..f520a5f86 100644
--- a/plugins/modules/networks_appliance_firewall_firewalled_services_info.py
+++ b/plugins/modules/networks_appliance_firewall_firewalled_services_info.py
@@ -5,70 +5,68 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_firewalled_services_info
-short_description: Information module for networks _appliance _firewall _firewalled _services
+author: Francisco Munoz (@fmunoz)
 description:
-- Get networks _appliance _firewall _firewalled _services by id.
-- Return the accessibility settings of the given service 'ICMP', 'web', or 'SNMP' .
-version_added: '2.16.0'
+  - Get networks _appliance _firewall _firewalled _services by id.
+  - Return the accessibility settings of the given service 'ICMP', 'web', or 'SNMP'
+    .
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_firewalled_services_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_firewalled_service,
+  - Paths used are get /networks/{networkId}/appliance/firewall/firewalledServices/{service},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   service:
     description:
-    - Service path parameter.
+      - Service path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallFirewalledService
-  description: Complete reference of the getNetworkApplianceFirewallFirewalledService API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-firewalled-service
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_firewalled_service,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/firewalledServices/{service},
+  - description: Complete reference of the getNetworkApplianceFirewallFirewalledService
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-firewalled-service
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallFirewalledService
+short_description: Information module for networks _appliance _firewall _firewalled
+  _services
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get networks _appliance _firewall _firewalled _services by id
   cisco.meraki.networks_appliance_firewall_firewalled_services_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     service: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_inbound_firewall_rules.py b/plugins/modules/networks_appliance_firewall_inbound_firewall_rules.py
index 3b8241644..7f5f4dd14 100644
--- a/plugins/modules/networks_appliance_firewall_inbound_firewall_rules.py
+++ b/plugins/modules/networks_appliance_firewall_inbound_firewall_rules.py
@@ -5,30 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_inbound_firewall_rules
-short_description: Resource module for networks _appliance _firewall _inbound _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _inbound _firewall _rules.
-- Update the inbound firewall rules of an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _inbound
+    _firewall _rules.
+  - Update the inbound firewall rules of an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_inbound_firewall_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_inbound_firewall_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/inboundFirewallRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
   rules:
-    description: An ordered array of the firewall rules (not including the default rule).
+    description: An ordered array of the firewall rules (not including the default
+      rule).
     elements: dict
     suboptions:
       comment:
         description: Description of the rule (optional).
         type: str
       destCidr:
-        description: Comma-separated list of destination IP address(es) (in IP or CIDR
-          notation), fully-qualified domain names (FQDN) or 'any'.
+        description: Comma-separated list of destination IP address(es) (in IP or
+          CIDR notation), fully-qualified domain names (FQDN) or 'any'.
         type: str
       destPort:
         description: Comma-separated list of destination port(s) (integer in the range
@@ -42,16 +44,16 @@
           'any').
         type: str
       srcCidr:
-        description: Comma-separated list of source IP address(es) (in IP or CIDR notation),
-          or 'any' (note FQDN not supported for source addresses).
+        description: Comma-separated list of source IP address(es) (in IP or CIDR
+          notation), or 'any' (note FQDN not supported for source addresses).
         type: str
       srcPort:
-        description: Comma-separated list of source port(s) (integer in the range 1-65535),
-          or 'any'.
+        description: Comma-separated list of source port(s) (integer in the range
+          1-65535), or 'any'.
         type: str
       syslogEnabled:
-        description: Log this rule to syslog (true or false, boolean value) - only applicable
-          if a syslog has been configured (optional).
+        description: Log this rule to syslog (true or false, boolean value) - only
+          applicable if a syslog has been configured (optional).
         type: bool
     type: list
   syslogDefaultRule:
@@ -59,56 +61,53 @@
       configured a syslog server) (optional).
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallInboundFirewallRules
-  description: Complete reference of the updateNetworkApplianceFirewallInboundFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-inbound-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_inbound_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/inboundFirewallRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallInboundFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-inbound-firewall-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallInboundFirewallRules
+short_description: Resource module for networks _appliance _firewall _inbound _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_inbound_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - comment: Allow TCP traffic to subnet with HTTP servers.
-      destCidr: 192.168.1.0/24
-      destPort: '443'
-      policy: allow
-      protocol: tcp
-      srcCidr: Any
-      srcPort: Any
-      syslogEnabled: false
+      - comment: Allow TCP traffic to subnet with HTTP servers.
+        destCidr: 192.168.1.0/24
+        destPort: '443'
+        policy: allow
+        protocol: tcp
+        srcCidr: Any
+        srcPort: Any
+        syslogEnabled: false
     syslogDefaultRule: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_inbound_firewall_rules_info.py b/plugins/modules/networks_appliance_firewall_inbound_firewall_rules_info.py
index 08987858f..5c21cba31 100644
--- a/plugins/modules/networks_appliance_firewall_inbound_firewall_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_inbound_firewall_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_inbound_firewall_rules_info
-short_description: Information module for networks _appliance _firewall _inbound _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _inbound _firewall _rules.
-- Return the inbound firewall rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _inbound _firewall _rules.
+  - Return the inbound firewall rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_inbound_firewall_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_inbound_firewall_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/inboundFirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallInboundFirewallRules
-  description: Complete reference of the getNetworkApplianceFirewallInboundFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-inbound-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_inbound_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/inboundFirewallRules,
+  - description: Complete reference of the getNetworkApplianceFirewallInboundFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-inbound-firewall-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallInboundFirewallRules
+short_description: Information module for networks _appliance _firewall _inbound _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _inbound _firewall _rules
   cisco.meraki.networks_appliance_firewall_inbound_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_l3_firewall_rules.py b/plugins/modules/networks_appliance_firewall_l3_firewall_rules.py
index 5ad006561..a841e84bf 100644
--- a/plugins/modules/networks_appliance_firewall_l3_firewall_rules.py
+++ b/plugins/modules/networks_appliance_firewall_l3_firewall_rules.py
@@ -5,30 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_l3_firewall_rules
-short_description: Resource module for networks _appliance _firewall l3 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall l3 _firewall _rules.
-- Update the L3 firewall rules of an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall l3 _firewall
+    _rules.
+  - Update the L3 firewall rules of an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_l3_firewall_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_l3_firewall_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/l3FirewallRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
   rules:
-    description: An ordered array of the firewall rules (not including the default rule).
+    description: An ordered array of the firewall rules (not including the default
+      rule).
     elements: dict
     suboptions:
       comment:
         description: Description of the rule (optional).
         type: str
       destCidr:
-        description: Comma-separated list of destination IP address(es) (in IP or CIDR
-          notation), fully-qualified domain names (FQDN) or 'any'.
+        description: Comma-separated list of destination IP address(es) (in IP or
+          CIDR notation), fully-qualified domain names (FQDN) or 'any'.
         type: str
       destPort:
         description: Comma-separated list of destination port(s) (integer in the range
@@ -42,16 +44,16 @@
           'any').
         type: str
       srcCidr:
-        description: Comma-separated list of source IP address(es) (in IP or CIDR notation),
-          or 'any' (note FQDN not supported for source addresses).
+        description: Comma-separated list of source IP address(es) (in IP or CIDR
+          notation), or 'any' (note FQDN not supported for source addresses).
         type: str
       srcPort:
-        description: Comma-separated list of source port(s) (integer in the range 1-65535),
-          or 'any'.
+        description: Comma-separated list of source port(s) (integer in the range
+          1-65535), or 'any'.
         type: str
       syslogEnabled:
-        description: Log this rule to syslog (true or false, boolean value) - only applicable
-          if a syslog has been configured (optional).
+        description: Log this rule to syslog (true or false, boolean value) - only
+          applicable if a syslog has been configured (optional).
         type: bool
     type: list
   syslogDefaultRule:
@@ -59,55 +61,52 @@
       configured a syslog server) (optional).
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallL3FirewallRules
-  description: Complete reference of the updateNetworkApplianceFirewallL3FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-l3-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_l3_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/l3FirewallRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallL3FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-l3-firewall-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallL3FirewallRules
+short_description: Resource module for networks _appliance _firewall l3 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_l3_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - comment: Allow TCP traffic to subnet with HTTP servers.
-      destCidr: 192.168.1.0/24
-      destPort: '443'
-      policy: allow
-      protocol: tcp
-      srcCidr: Any
-      srcPort: Any
-      syslogEnabled: false
-
+      - comment: Allow TCP traffic to subnet with HTTP servers.
+        destCidr: 192.168.1.0/24
+        destPort: '443'
+        policy: allow
+        protocol: tcp
+        srcCidr: Any
+        srcPort: Any
+        syslogEnabled: false
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_l3_firewall_rules_info.py b/plugins/modules/networks_appliance_firewall_l3_firewall_rules_info.py
index 5285c83e4..66575d768 100644
--- a/plugins/modules/networks_appliance_firewall_l3_firewall_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_l3_firewall_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_l3_firewall_rules_info
-short_description: Information module for networks _appliance _firewall l3 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall l3 _firewall _rules.
-- Return the L3 firewall rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall l3 _firewall _rules.
+  - Return the L3 firewall rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_l3_firewall_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_l3_firewall_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/l3FirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL3FirewallRules
-  description: Complete reference of the getNetworkApplianceFirewallL3FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l3-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_l3_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/l3FirewallRules,
+  - description: Complete reference of the getNetworkApplianceFirewallL3FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l3-firewall-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL3FirewallRules
+short_description: Information module for networks _appliance _firewall l3 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall l3 _firewall _rules
   cisco.meraki.networks_appliance_firewall_l3_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_l7_firewall_rules.py b/plugins/modules/networks_appliance_firewall_l7_firewall_rules.py
index c5888c99e..d914ce6a4 100644
--- a/plugins/modules/networks_appliance_firewall_l7_firewall_rules.py
+++ b/plugins/modules/networks_appliance_firewall_l7_firewall_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_l7_firewall_rules
-short_description: Resource module for networks _appliance _firewall l7 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall l7 _firewall _rules.
-- Update the MX L7 firewall rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall l7 _firewall
+    _rules.
+  - Update the MX L7 firewall rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_l7_firewall_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_l7_firewall_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/l7FirewallRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -38,59 +39,56 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallL7FirewallRules
-  description: Complete reference of the updateNetworkApplianceFirewallL7FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-l7-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_l7_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/l7FirewallRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallL7FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-l7-firewall-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallL7FirewallRules
+short_description: Resource module for networks _appliance _firewall l7 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_l7_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - policy: deny
-      type: host
-      value: google.com
-    - policy: deny
-      type: port
-      value: '23'
-    - policy: deny
-      type: ipRange
-      value: 10.11.12.00/24
-    - policy: deny
-      type: ipRange
-      value: 10.11.12.00/24:5555
-
+      - policy: deny
+        type: host
+        value: google.com
+      - policy: deny
+        type: port
+        value: '23'
+      - policy: deny
+        type: ipRange
+        value: 10.11.12.00/24
+      - policy: deny
+        type: ipRange
+        value: 10.11.12.00/24:5555
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_l7_firewall_rules_application_categories_info.py b/plugins/modules/networks_appliance_firewall_l7_firewall_rules_application_categories_info.py
index 068b4db0a..dd1262fdb 100644
--- a/plugins/modules/networks_appliance_firewall_l7_firewall_rules_application_categories_info.py
+++ b/plugins/modules/networks_appliance_firewall_l7_firewall_rules_application_categories_info.py
@@ -5,65 +5,63 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_l7_firewall_rules_application_categories_info
-short_description: Information module for networks _appliance _firewall l7 _firewall _rules _application _categories
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall l7 _firewall _rules _application _categories.
-- Return the L7 firewall application categories and their associated applications for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall l7 _firewall _rules _application _categories.
+  - Return the L7 firewall application categories and their associated applications
+    for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_l7_firewall_rules_application_categories_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_l7_firewall_rules_application_categories,
+  - Paths used are get /networks/{networkId}/appliance/firewall/l7FirewallRules/applicationCategories,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL7FirewallRulesApplicationCategories
-  description: Complete reference of the getNetworkApplianceFirewallL7FirewallRulesApplicationCategories API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l7-firewall-rules-application-categories
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_l7_firewall_rules_application_categories,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/l7FirewallRules/applicationCategories,
+  - description: Complete reference of the getNetworkApplianceFirewallL7FirewallRulesApplicationCategories
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l7-firewall-rules-application-categories
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL7FirewallRulesApplicationCategories
+short_description: Information module for networks _appliance _firewall l7 _firewall
+  _rules _application _categories
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall l7 _firewall _rules _application _categories
   cisco.meraki.networks_appliance_firewall_l7_firewall_rules_application_categories_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_l7_firewall_rules_info.py b/plugins/modules/networks_appliance_firewall_l7_firewall_rules_info.py
index bf0d062f2..ffc598067 100644
--- a/plugins/modules/networks_appliance_firewall_l7_firewall_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_l7_firewall_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_l7_firewall_rules_info
-short_description: Information module for networks _appliance _firewall l7 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall l7 _firewall _rules.
-- List the MX L7 firewall rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall l7 _firewall _rules.
+  - List the MX L7 firewall rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_l7_firewall_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_l7_firewall_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/l7FirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL7FirewallRules
-  description: Complete reference of the getNetworkApplianceFirewallL7FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l7-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_l7_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/l7FirewallRules,
+  - description: Complete reference of the getNetworkApplianceFirewallL7FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-l7-firewall-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallL7FirewallRules
+short_description: Information module for networks _appliance _firewall l7 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall l7 _firewall _rules
   cisco.meraki.networks_appliance_firewall_l7_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules.py b/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules.py
index 219ebfed4..3d3230bef 100644
--- a/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules.py
+++ b/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_one_to_many_nat_rules
-short_description: Resource module for networks _appliance _firewall _one _to _many _nat _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _one _to _many _nat _rules.
-- Set the 1 Many NAT mapping rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _one _to
+    _many _nat _rules.
+  - Set the 1 Many NAT mapping rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_one_to_many_nat_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_one_to_many_nat_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/oneToManyNatRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -37,9 +38,9 @@
             type: str
           localPort:
             description: Destination port of the forwarded traffic that will be sent
-              from the MX to the specified host on the LAN. If you simply wish to forward
-              the traffic without translating the port, this should be the same as the
-              Public port.
+              from the MX to the specified host on the LAN. If you simply wish to
+              forward the traffic without translating the port, this should be the
+              same as the Public port.
             type: str
           name:
             description: A description of the rule.
@@ -61,65 +62,62 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallOneToManyNatRules
-  description: Complete reference of the updateNetworkApplianceFirewallOneToManyNatRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-one-to-many-nat-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_one_to_many_nat_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/oneToManyNatRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallOneToManyNatRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-one-to-many-nat-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallOneToManyNatRules
+short_description: Resource module for networks _appliance _firewall _one _to _many
+  _nat _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_one_to_many_nat_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - portRules:
-      - allowedIps:
-        - any
-        localIp: 192.168.128.1
-        localPort: '443'
-        name: Rule 1
-        protocol: tcp
-        publicPort: '9443'
-      - allowedIps:
-        - 10.82.110.0/24
-        - 10.82.111.0/24
-        localIp: 192.168.128.1
-        localPort: '80'
-        name: Rule 2
-        protocol: tcp
-        publicPort: '8080'
-      publicIp: 146.11.11.13
-      uplink: internet1
-
+      - portRules:
+          - allowedIps:
+              - any
+            localIp: 192.168.128.1
+            localPort: '443'
+            name: Rule 1
+            protocol: tcp
+            publicPort: '9443'
+          - allowedIps:
+              - 10.82.110.0/24
+              - 10.82.111.0/24
+            localIp: 192.168.128.1
+            localPort: '80'
+            name: Rule 2
+            protocol: tcp
+            publicPort: '8080'
+        publicIp: 146.11.11.13
+        uplink: internet1
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules_info.py b/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules_info.py
index 4baefd743..246458f20 100644
--- a/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_one_to_many_nat_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_one_to_many_nat_rules_info
-short_description: Information module for networks _appliance _firewall _one _to _many _nat _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _one _to _many _nat _rules.
-- Return the 1 Many NAT mapping rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _one _to _many _nat _rules.
+  - Return the 1 Many NAT mapping rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_one_to_many_nat_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_one_to_many_nat_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/oneToManyNatRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallOneToManyNatRules
-  description: Complete reference of the getNetworkApplianceFirewallOneToManyNatRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-one-to-many-nat-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_one_to_many_nat_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/oneToManyNatRules,
+  - description: Complete reference of the getNetworkApplianceFirewallOneToManyNatRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-one-to-many-nat-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallOneToManyNatRules
+short_description: Information module for networks _appliance _firewall _one _to _many
+  _nat _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _one _to _many _nat _rules
   cisco.meraki.networks_appliance_firewall_one_to_many_nat_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules.py b/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules.py
index 47a07491f..1a89d6360 100644
--- a/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules.py
+++ b/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_one_to_one_nat_rules
-short_description: Resource module for networks _appliance _firewall _one _to _one _nat _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _one _to _one _nat _rules.
-- Set the 1 1 NAT mapping rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _one _to
+    _one _nat _rules.
+  - Set the 1 1 NAT mapping rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_one_to_one_nat_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_one_to_one_nat_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/oneToOneNatRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -24,8 +25,8 @@
     elements: dict
     suboptions:
       allowedInbound:
-        description: The ports this mapping will provide access on, and the remote IPs
-          that will be allowed access to the resource.
+        description: The ports this mapping will provide access on, and the remote
+          IPs that will be allowed access to the resource.
         elements: dict
         suboptions:
           allowedIps:
@@ -59,64 +60,61 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallOneToOneNatRules
-  description: Complete reference of the updateNetworkApplianceFirewallOneToOneNatRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-one-to-one-nat-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_one_to_one_nat_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/oneToOneNatRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallOneToOneNatRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-one-to-one-nat-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallOneToOneNatRules
+short_description: Resource module for networks _appliance _firewall _one _to _one
+  _nat _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_one_to_one_nat_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - allowedInbound:
-      - allowedIps:
-        - 10.82.112.0/24
-        - 10.82.0.0/16
-        destinationPorts:
-        - '80'
-        protocol: tcp
-      - allowedIps:
-        - 10.81.110.5
-        - 10.81.0.0/16
-        destinationPorts:
-        - '8080'
-        protocol: udp
-      lanIp: 192.168.128.22
-      name: Service behind NAT
-      publicIp: 146.12.3.33
-      uplink: internet1
-
+      - allowedInbound:
+          - allowedIps:
+              - 10.82.112.0/24
+              - 10.82.0.0/16
+            destinationPorts:
+              - '80'
+            protocol: tcp
+          - allowedIps:
+              - 10.81.110.5
+              - 10.81.0.0/16
+            destinationPorts:
+              - '8080'
+            protocol: udp
+        lanIp: 192.168.128.22
+        name: Service behind NAT
+        publicIp: 146.12.3.33
+        uplink: internet1
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules_info.py b/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules_info.py
index e67dbcc8c..d9f8b7fb3 100644
--- a/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_one_to_one_nat_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_one_to_one_nat_rules_info
-short_description: Information module for networks _appliance _firewall _one _to _one _nat _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _one _to _one _nat _rules.
-- Return the 1 1 NAT mapping rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _one _to _one _nat _rules.
+  - Return the 1 1 NAT mapping rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_one_to_one_nat_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_one_to_one_nat_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/oneToOneNatRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallOneToOneNatRules
-  description: Complete reference of the getNetworkApplianceFirewallOneToOneNatRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-one-to-one-nat-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_one_to_one_nat_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/oneToOneNatRules,
+  - description: Complete reference of the getNetworkApplianceFirewallOneToOneNatRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-one-to-one-nat-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallOneToOneNatRules
+short_description: Information module for networks _appliance _firewall _one _to _one
+  _nat _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _one _to _one _nat _rules
   cisco.meraki.networks_appliance_firewall_one_to_one_nat_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_port_forwarding_rules.py b/plugins/modules/networks_appliance_firewall_port_forwarding_rules.py
index 7744ff1b1..12a6cedfd 100644
--- a/plugins/modules/networks_appliance_firewall_port_forwarding_rules.py
+++ b/plugins/modules/networks_appliance_firewall_port_forwarding_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_port_forwarding_rules
-short_description: Resource module for networks _appliance _firewall _port _forwarding _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _port _forwarding _rules.
-- Update the port forwarding rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _port _forwarding
+    _rules.
+  - Update the port forwarding rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_port_forwarding_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_port_forwarding_rules,
+  - Paths used are put /networks/{networkId}/appliance/firewall/portForwardingRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -33,8 +34,8 @@
           resource that you wish to make available on the WAN.
         type: str
       localPort:
-        description: A port or port ranges that will receive the forwarded traffic from
-          the WAN.
+        description: A port or port ranges that will receive the forwarded traffic
+          from the WAN.
         type: str
       name:
         description: A descriptive name for the rule.
@@ -52,55 +53,52 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallPortForwardingRules
-  description: Complete reference of the updateNetworkApplianceFirewallPortForwardingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-port-forwarding-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_port_forwarding_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/portForwardingRules,
+  - description: Complete reference of the updateNetworkApplianceFirewallPortForwardingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-port-forwarding-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallPortForwardingRules
+short_description: Resource module for networks _appliance _firewall _port _forwarding
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_port_forwarding_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - allowedIps:
-      - any
-      lanIp: 192.168.128.1
-      localPort: 442-443
-      name: Description of Port Forwarding Rule
-      protocol: tcp
-      publicPort: 8100-8101
-      uplink: both
-
+      - allowedIps:
+          - any
+        lanIp: 192.168.128.1
+        localPort: 442-443
+        name: Description of Port Forwarding Rule
+        protocol: tcp
+        publicPort: 8100-8101
+        uplink: both
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_port_forwarding_rules_info.py b/plugins/modules/networks_appliance_firewall_port_forwarding_rules_info.py
index ecd276236..a12a6cb57 100644
--- a/plugins/modules/networks_appliance_firewall_port_forwarding_rules_info.py
+++ b/plugins/modules/networks_appliance_firewall_port_forwarding_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_port_forwarding_rules_info
-short_description: Information module for networks _appliance _firewall _port _forwarding _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _port _forwarding _rules.
-- Return the port forwarding rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _port _forwarding _rules.
+  - Return the port forwarding rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_port_forwarding_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_port_forwarding_rules,
+  - Paths used are get /networks/{networkId}/appliance/firewall/portForwardingRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallPortForwardingRules
-  description: Complete reference of the getNetworkApplianceFirewallPortForwardingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-port-forwarding-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_port_forwarding_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/portForwardingRules,
+  - description: Complete reference of the getNetworkApplianceFirewallPortForwardingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-port-forwarding-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallPortForwardingRules
+short_description: Information module for networks _appliance _firewall _port _forwarding
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _port _forwarding _rules
   cisco.meraki.networks_appliance_firewall_port_forwarding_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_settings.py b/plugins/modules/networks_appliance_firewall_settings.py
index a3fa822e5..fadb0e8e0 100644
--- a/plugins/modules/networks_appliance_firewall_settings.py
+++ b/plugins/modules/networks_appliance_firewall_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_settings
-short_description: Resource module for networks _appliance _firewall _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _firewall _settings.
-- Update the firewall settings for this network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _firewall _settings.
+  - Update the firewall settings for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_settings
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_firewall_settings,
+  - Paths used are put /networks/{networkId}/appliance/firewall/settings,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -31,49 +31,45 @@
         type: dict
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallSettings
-  description: Complete reference of the updateNetworkApplianceFirewallSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_firewall_settings,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/firewall/settings,
+  - description: Complete reference of the updateNetworkApplianceFirewallSettings
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-firewall-settings
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceFirewallSettings
+short_description: Resource module for networks _appliance _firewall _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_firewall_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     spoofingProtection:
       ipSourceGuard:
         mode: block
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_firewall_settings_info.py b/plugins/modules/networks_appliance_firewall_settings_info.py
index fdd74c905..fbe788359 100644
--- a/plugins/modules/networks_appliance_firewall_settings_info.py
+++ b/plugins/modules/networks_appliance_firewall_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_firewall_settings_info
-short_description: Information module for networks _appliance _firewall _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _firewall _settings.
-- Return the firewall settings for this network.
-version_added: '2.16.0'
+  - Get all networks _appliance _firewall _settings.
+  - Return the firewall settings for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_firewall_settings_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_firewall_settings,
+  - Paths used are get /networks/{networkId}/appliance/firewall/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallSettings
-  description: Complete reference of the getNetworkApplianceFirewallSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_firewall_settings,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/firewall/settings,
+  - description: Complete reference of the getNetworkApplianceFirewallSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-firewall-settings
+    name: Cisco Meraki documentation for appliance getNetworkApplianceFirewallSettings
+short_description: Information module for networks _appliance _firewall _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _firewall _settings
   cisco.meraki.networks_appliance_firewall_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_ports.py b/plugins/modules/networks_appliance_ports.py
index 2701431f3..7b12b4ab4 100644
--- a/plugins/modules/networks_appliance_ports.py
+++ b/plugins/modules/networks_appliance_ports.py
@@ -5,22 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_ports
-short_description: Resource module for networks _appliance _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _ports.
-- Update the per-port VLAN settings for a single MX port.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _ports.
+  - Update the per-port VLAN settings for a single MX port.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_ports
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_port,
+  - Paths used are put /networks/{networkId}/appliance/ports/{portId},
 options:
   accessPolicy:
     description: The name of the policy. Only applicable to Access ports. Valid values
-      are 'open', '8021x-radius', 'mac-radius', 'hybris-radius' for MX64 or Z3 or any
-      MX supporting the per port authentication feature. Otherwise, 'open' is the only
-      valid value and 'open' is the default value if the field is missing.
+      are 'open', '8021x-radius', 'mac-radius', 'hybris-radius' for MX64 or Z3 or
+      any MX supporting the per port authentication feature. Otherwise, 'open' is
+      the only valid value and 'open' is the default value if the field is missing.
     type: str
   allowedVlans:
     description: Comma-delimited list of the VLAN ID's allowed on the port, or 'all'
@@ -43,47 +43,43 @@
     description: The type of the port 'access' or 'trunk'.
     type: str
   vlan:
-    description: Native VLAN when the port is in Trunk mode. Access VLAN when the port
-      is in Access mode.
+    description: Native VLAN when the port is in Trunk mode. Access VLAN when the
+      port is in Access mode.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkAppliancePort
-  description: Complete reference of the updateNetworkAppliancePort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-port
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_port,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/ports/{portId},
+  - description: Complete reference of the updateNetworkAppliancePort API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-port
+    name: Cisco Meraki documentation for appliance updateNetworkAppliancePort
+short_description: Resource module for networks _appliance _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_appliance_ports:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPolicy: open
     allowedVlans: all
@@ -93,7 +89,6 @@
     portId: string
     type: access
     vlan: 3
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_ports_info.py b/plugins/modules/networks_appliance_ports_info.py
index 3fbe13138..f827b000f 100644
--- a/plugins/modules/networks_appliance_ports_info.py
+++ b/plugins/modules/networks_appliance_ports_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_ports_info
-short_description: Information module for networks _appliance _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _ports.
-- Get networks _appliance _ports by id.
-- List per-port VLAN settings for all ports of a MX.
-- Return per-port VLAN settings for a single MX port.
-version_added: '2.16.0'
+  - Get all networks _appliance _ports.
+  - Get networks _appliance _ports by id.
+  - List per-port VLAN settings for all ports of a MX.
+  - Return per-port VLAN settings for a single MX port.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_ports_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_port, appliance.Appliance.get_network_appliance_ports,
+  - Paths used are get /networks/{networkId}/appliance/ports, get /networks/{networkId}/appliance/ports/{portId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   portId:
     description:
-    - PortId path parameter. Port ID.
+      - PortId path parameter. Port ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkAppliancePort
-  description: Complete reference of the getNetworkAppliancePort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-port
-- name: Cisco Meraki documentation for appliance getNetworkAppliancePorts
-  description: Complete reference of the getNetworkAppliancePorts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ports
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_port,
-    appliance.Appliance.get_network_appliance_ports,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/ports,
-    get /networks/{networkId}/appliance/ports/{portId},
+  - description: Complete reference of the getNetworkAppliancePort API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-port
+    name: Cisco Meraki documentation for appliance getNetworkAppliancePort
+  - description: Complete reference of the getNetworkAppliancePorts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ports
+    name: Cisco Meraki documentation for appliance getNetworkAppliancePorts
+short_description: Information module for networks _appliance _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _ports
   cisco.meraki.networks_appliance_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _appliance _ports by id
   cisco.meraki.networks_appliance_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     portId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_prefixes_delegated_statics.py b/plugins/modules/networks_appliance_prefixes_delegated_statics.py
index 503495828..a82e7bc86 100644
--- a/plugins/modules/networks_appliance_prefixes_delegated_statics.py
+++ b/plugins/modules/networks_appliance_prefixes_delegated_statics.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_prefixes_delegated_statics
-short_description: Resource module for networks _appliance _prefixes _delegated _statics
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _appliance _prefixes _delegated _statics.
-- Add a static delegated prefix from a network.
-- Delete a static delegated prefix from a network.
-- Update a static delegated prefix from a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _appliance
+    _prefixes _delegated _statics.
+  - Add a static delegated prefix from a network.
+  - Delete a static delegated prefix from a network.
+  - Update a static delegated prefix from a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_prefixes_delegated_statics
+notes:
+  - SDK Method used are appliance.Appliance.create_network_appliance_prefixes_delegated_static,
+    appliance.Appliance.delete_network_appliance_prefixes_delegated_static, appliance.Appliance.update_network_appliance_prefixes_delegated_static,
+  - Paths used are post /networks/{networkId}/appliance/prefixes/delegated/statics,
+    delete /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
+    put /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
 options:
   description:
     description: A name or description for the prefix.
@@ -42,120 +46,112 @@
     description: StaticDelegatedPrefixId path parameter. Static delegated prefix ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance createNetworkAppliancePrefixesDelegatedStatic
-  description: Complete reference of the createNetworkAppliancePrefixesDelegatedStatic API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-prefixes-delegated-static
-- name: Cisco Meraki documentation for appliance deleteNetworkAppliancePrefixesDelegatedStatic
-  description: Complete reference of the deleteNetworkAppliancePrefixesDelegatedStatic API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-appliance-prefixes-delegated-static
-- name: Cisco Meraki documentation for appliance updateNetworkAppliancePrefixesDelegatedStatic
-  description: Complete reference of the updateNetworkAppliancePrefixesDelegatedStatic API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-prefixes-delegated-static
-notes:
-  - SDK Method used are
-    appliance.Appliance.create_network_appliance_prefixes_delegated_static,
-    appliance.Appliance.delete_network_appliance_prefixes_delegated_static,
-    appliance.Appliance.update_network_appliance_prefixes_delegated_static,
-
-  - Paths used are
-    post /networks/{networkId}/appliance/prefixes/delegated/statics,
-    delete /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
-    put /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
+  - description: Complete reference of the createNetworkAppliancePrefixesDelegatedStatic
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-prefixes-delegated-static
+    name: Cisco Meraki documentation for appliance createNetworkAppliancePrefixesDelegatedStatic
+  - description: Complete reference of the deleteNetworkAppliancePrefixesDelegatedStatic
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-appliance-prefixes-delegated-static
+    name: Cisco Meraki documentation for appliance deleteNetworkAppliancePrefixesDelegatedStatic
+  - description: Complete reference of the updateNetworkAppliancePrefixesDelegatedStatic
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-prefixes-delegated-static
+    name: Cisco Meraki documentation for appliance updateNetworkAppliancePrefixesDelegatedStatic
+short_description: Resource module for networks _appliance _prefixes _delegated _statics
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_appliance_prefixes_delegated_statics:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     description: Prefix on WAN 1 of Long Island Office network
     networkId: string
     origin:
       interfaces:
-      - wan1
+        - wan1
       type: internet
     prefix: 2001:db8:3c4d:15::/64
-
 - name: Delete by id
   cisco.meraki.networks_appliance_prefixes_delegated_statics:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     staticDelegatedPrefixId: string
-
 - name: Update by id
   cisco.meraki.networks_appliance_prefixes_delegated_statics:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     description: Prefix on WAN 1 of Long Island Office network
     networkId: string
     origin:
       interfaces:
-      - wan1
+        - wan1
       type: internet
     prefix: 2001:db8:3c4d:15::/64
     staticDelegatedPrefixId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_prefixes_delegated_statics_info.py b/plugins/modules/networks_appliance_prefixes_delegated_statics_info.py
index 829708d54..a7fa73a36 100644
--- a/plugins/modules/networks_appliance_prefixes_delegated_statics_info.py
+++ b/plugins/modules/networks_appliance_prefixes_delegated_statics_info.py
@@ -5,102 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_prefixes_delegated_statics_info
-short_description: Information module for networks _appliance _prefixes _delegated _statics
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _prefixes _delegated _statics.
-- Get networks _appliance _prefixes _delegated _statics by id.
-- List static delegated prefixes for a network.
-- Return a static delegated prefix from a network.
-version_added: '2.16.0'
+  - Get all networks _appliance _prefixes _delegated _statics.
+  - Get networks _appliance _prefixes _delegated _statics by id.
+  - List static delegated prefixes for a network.
+  - Return a static delegated prefix from a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_prefixes_delegated_statics_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_prefixes_delegated_static,
+    appliance.Appliance.get_network_appliance_prefixes_delegated_statics,
+  - Paths used are get /networks/{networkId}/appliance/prefixes/delegated/statics,
+    get /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   staticDelegatedPrefixId:
     description:
-    - StaticDelegatedPrefixId path parameter. Static delegated prefix ID.
+      - StaticDelegatedPrefixId path parameter. Static delegated prefix ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkAppliancePrefixesDelegatedStatic
-  description: Complete reference of the getNetworkAppliancePrefixesDelegatedStatic API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-prefixes-delegated-static
-- name: Cisco Meraki documentation for appliance getNetworkAppliancePrefixesDelegatedStatics
-  description: Complete reference of the getNetworkAppliancePrefixesDelegatedStatics API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-prefixes-delegated-statics
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_prefixes_delegated_static,
-    appliance.Appliance.get_network_appliance_prefixes_delegated_statics,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/prefixes/delegated/statics,
-    get /networks/{networkId}/appliance/prefixes/delegated/statics/{staticDelegatedPrefixId},
+  - description: Complete reference of the getNetworkAppliancePrefixesDelegatedStatic
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-prefixes-delegated-static
+    name: Cisco Meraki documentation for appliance getNetworkAppliancePrefixesDelegatedStatic
+  - description: Complete reference of the getNetworkAppliancePrefixesDelegatedStatics
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-prefixes-delegated-statics
+    name: Cisco Meraki documentation for appliance getNetworkAppliancePrefixesDelegatedStatics
+short_description: Information module for networks _appliance _prefixes _delegated
+  _statics
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _prefixes _delegated _statics
   cisco.meraki.networks_appliance_prefixes_delegated_statics_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _appliance _prefixes _delegated _statics by id
   cisco.meraki.networks_appliance_prefixes_delegated_statics_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     staticDelegatedPrefixId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_rf_profiles.py b/plugins/modules/networks_appliance_rf_profiles.py
index 18261b8b2..4ef76602f 100644
--- a/plugins/modules/networks_appliance_rf_profiles.py
+++ b/plugins/modules/networks_appliance_rf_profiles.py
@@ -5,28 +5,29 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_rf_profiles
-short_description: Resource module for networks _appliance _rf _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _appliance _rf _profiles.
-- Creates new RF profile for this network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _appliance
+    _rf _profiles.
+  - Creates new RF profile for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_rf_profiles
+notes:
+  - SDK Method used are appliance.Appliance.create_network_appliance_rf_profile,
+  - Paths used are post /networks/{networkId}/appliance/rfProfiles,
 options:
   fiveGhzSettings:
     description: Settings related to 5Ghz band.
     suboptions:
       axEnabled:
-        description: Determines whether ax radio on 5Ghz band is on or off. Can be either
-          true or false. If false, we highly recommend disabling band steering. Defaults
-          to true.
+        description: Determines whether ax radio on 5Ghz band is on or off. Can be
+          either true or false. If false, we highly recommend disabling band steering.
+          Defaults to true.
         type: bool
       minBitrate:
-        description: Sets min bitrate (Mbps) of 5Ghz band. Can be one of '6', '9', '12',
-          '18', '24', '36', '48' or '54'. Defaults to 12.
+        description: Sets min bitrate (Mbps) of 5Ghz band. Can be one of '6', '9',
+          '12', '18', '24', '36', '48' or '54'. Defaults to 12.
         type: int
     type: dict
   name:
@@ -88,53 +89,50 @@
     description: Settings related to 2.4Ghz band.
     suboptions:
       axEnabled:
-        description: Determines whether ax radio on 2.4Ghz band is on or off. Can be
-          either true or false. If false, we highly recommend disabling band steering.
+        description: Determines whether ax radio on 2.4Ghz band is on or off. Can
+          be either true or false. If false, we highly recommend disabling band steering.
           Defaults to true.
         type: bool
       minBitrate:
         description: Sets min bitrate (Mbps) of 2.4Ghz band. Can be one of '1', '2',
-          '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'. Defaults to 11.
+          '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'. Defaults to
+          11.
         type: float
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance createNetworkApplianceRfProfile
-  description: Complete reference of the createNetworkApplianceRfProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-rf-profile
-notes:
-  - SDK Method used are
-    appliance.Appliance.create_network_appliance_rf_profile,
-
-  - Paths used are
-    post /networks/{networkId}/appliance/rfProfiles,
+  - description: Complete reference of the createNetworkApplianceRfProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-rf-profile
+    name: Cisco Meraki documentation for appliance createNetworkApplianceRfProfile
+short_description: Resource module for networks _appliance _rf _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_appliance_rf_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     fiveGhzSettings:
       axEnabled: true
@@ -157,7 +155,6 @@
     twoFourGhzSettings:
       axEnabled: true
       minBitrate: 12.0
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_rf_profiles_info.py b/plugins/modules/networks_appliance_rf_profiles_info.py
index bde222061..7c70d317d 100644
--- a/plugins/modules/networks_appliance_rf_profiles_info.py
+++ b/plugins/modules/networks_appliance_rf_profiles_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_rf_profiles_info
-short_description: Information module for networks _appliance _rf _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _rf _profiles.
-- List the RF profiles for this network.
-version_added: '2.16.0'
+  - Get all networks _appliance _rf _profiles.
+  - List the RF profiles for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_rf_profiles_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_rf_profiles,
+  - Paths used are get /networks/{networkId}/appliance/rfProfiles,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceRfProfiles
-  description: Complete reference of the getNetworkApplianceRfProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-rf-profiles
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_rf_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/rfProfiles,
+  - description: Complete reference of the getNetworkApplianceRfProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-rf-profiles
+    name: Cisco Meraki documentation for appliance getNetworkApplianceRfProfiles
+short_description: Information module for networks _appliance _rf _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _rf _profiles
   cisco.meraki.networks_appliance_rf_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_sdwan_internet_policies.py b/plugins/modules/networks_appliance_sdwan_internet_policies.py
index b558f794d..a817329ec 100644
--- a/plugins/modules/networks_appliance_sdwan_internet_policies.py
+++ b/plugins/modules/networks_appliance_sdwan_internet_policies.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_sdwan_internet_policies
-short_description: Resource module for networks _appliance _sdwan _internet _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _sdwan _internet _policies.
-- Update SDWAN internet traffic preferences for an MX network.
-version_added: '2.20.0'
+  - Manage operation update of the resource networks _appliance _sdwan _internet _policies.
+  - Update SDWAN internet traffic preferences for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_sdwan_internet_policies
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_sdwan_internet_policies,
+  - Paths used are put /networks/{networkId}/appliance/sdwan/internetPolicies,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -38,8 +38,8 @@
               performanceClass type is "custom".
             type: str
           type:
-            description: Type of this performance class. Must be one of 'builtin' or
-              'custom'.
+            description: Type of this performance class. Must be one of 'builtin'
+              or 'custom'.
             type: str
         type: dict
       preferredUplink:
@@ -52,8 +52,8 @@
         suboptions:
           type:
             description: Traffic filter type. Must be 'custom', 'major_application',
-              'application (NBAR)', if type is 'application', you can pass either an
-              NBAR App Category or Application.
+              'application (NBAR)', if type is 'application', you can pass either
+              an NBAR App Category or Application.
             type: str
           value:
             description: Value of traffic filter.
@@ -71,37 +71,37 @@
                           Application Category or Application selections.
                         type: str
                       name:
-                        description: Name of the major application or application category
-                          selected.
+                        description: Name of the major application or application
+                          category selected.
                         type: str
                       type:
                         description: App type (major or nbar).
                         type: str
                     type: list
                   cidr:
-                    description: CIDR format address (e.g."192.168.10.1", which is the
-                      same as "192.168.10.1/32"), or "any".
+                    description: CIDR format address (e.g."192.168.10.1", which is
+                      the same as "192.168.10.1/32"), or "any".
                     type: str
                   port:
                     description: E.g. "any", "0" (also means "any"), "8080", "1-1024".
                     type: str
                 type: dict
               protocol:
-                description: Protocol of the traffic filter. Must be one of 'tcp', 'udp',
-                  'icmp6' or 'any'.
+                description: Protocol of the traffic filter. Must be one of 'tcp',
+                  'udp', 'icmp6' or 'any'.
                 type: str
               source:
                 description: Source of traffic filter.
                 suboptions:
                   cidr:
-                    description: CIDR format address (e.g."192.168.10.1", which is the
-                      same as "192.168.10.1/32"), or "any". Cannot be used in combination
-                      with the "vlan" property.
+                    description: CIDR format address (e.g."192.168.10.1", which is
+                      the same as "192.168.10.1/32"), or "any". Cannot be used in
+                      combination with the "vlan" property.
                     type: str
                   host:
                     description: Host ID in the VLAN. Should not exceed the VLAN subnet
-                      capacity. Must be used along with the "vlan" property and is currently
-                      only available under a template network.
+                      capacity. Must be used along with the "vlan" property and is
+                      currently only available under a template network.
                     type: int
                   port:
                     description: E.g. "any", "0" (also means "any"), "8080", "1-1024".
@@ -116,68 +116,64 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSdwanInternetPolicies
-  description: Complete reference of the updateNetworkApplianceSdwanInternetPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-sdwan-internet-policies
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_sdwan_internet_policies,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/sdwan/internetPolicies,
+  - description: Complete reference of the updateNetworkApplianceSdwanInternetPolicies
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-sdwan-internet-policies
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSdwanInternetPolicies
+short_description: Resource module for networks _appliance _sdwan _internet _policies
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_sdwan_internet_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     wanTrafficUplinkPreferences:
-    - failOverCriterion: poorPerformance
-      performanceClass:
-        builtinPerformanceClassName: VoIP
-        customPerformanceClassId: '123456'
-        type: custom
-      preferredUplink: wan1
-      trafficFilters:
-      - type: custom
-        value:
-          destination:
-            applications:
-            - id: meraki:layer7/application/3
-              name: DNS
-              type: major
-            cidr: any
-            port: any
-          protocol: tcp
-          source:
-            cidr: 192.168.1.0/24
-            host: 254
-            port: 1-1024
-            vlan: 10
-
+      - failOverCriterion: poorPerformance
+        performanceClass:
+          builtinPerformanceClassName: VoIP
+          customPerformanceClassId: '123456'
+          type: custom
+        preferredUplink: wan1
+        trafficFilters:
+          - type: custom
+            value:
+              destination:
+                applications:
+                  - id: meraki:layer7/application/3
+                    name: DNS
+                    type: major
+                cidr: any
+                port: any
+              protocol: tcp
+              source:
+                cidr: 192.168.1.0/24
+                host: 254
+                port: 1-1024
+                vlan: 10
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_security_intrusion.py b/plugins/modules/networks_appliance_security_intrusion.py
index 7c3b4aa6f..5f162b3c7 100644
--- a/plugins/modules/networks_appliance_security_intrusion.py
+++ b/plugins/modules/networks_appliance_security_intrusion.py
@@ -5,21 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_security_intrusion
-short_description: Resource module for networks _appliance _security _intrusion
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _security _intrusion.
-- Set the supported intrusion settings for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _security _intrusion.
+  - Set the supported intrusion settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_security_intrusion
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_security_intrusion,
+  - Paths used are put /networks/{networkId}/appliance/security/intrusion,
 options:
   idsRulesets:
     description: Set the detection ruleset 'connectivity'/'balanced'/'security' (optional
-      - omitting will leave current config unchanged). Default value is 'balanced' if
-      none currently saved.
+      - omitting will leave current config unchanged). Default value is 'balanced'
+      if none currently saved.
     type: str
   mode:
     description: Set mode to 'disabled'/'detection'/'prevention' (optional - omitting
@@ -39,68 +39,64 @@
         elements: str
         type: list
       includedCidr:
-        description: List of IP addresses or subnets being protected (required if 'useDefault'
-          is false).
+        description: List of IP addresses or subnets being protected (required if
+          'useDefault' is false).
         elements: str
         type: list
       useDefault:
-        description: True/false whether to use special IPv4 addresses https //tools.ietf.org/html/rfc5735
+        description: true/false whether to use special IPv4 addresses https //tools.ietf.org/html/rfc5735
           (required). Default value is true if none currently saved.
         type: bool
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSecurityIntrusion
-  description: Complete reference of the updateNetworkApplianceSecurityIntrusion API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-security-intrusion
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_security_intrusion,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/security/intrusion,
+  - description: Complete reference of the updateNetworkApplianceSecurityIntrusion
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-security-intrusion
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSecurityIntrusion
+short_description: Resource module for networks _appliance _security _intrusion
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_security_intrusion:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     idsRulesets: balanced
     mode: prevention
     networkId: string
     protectedNetworks:
       excludedCidr:
-      - 10.0.0.0/8
-      - 127.0.0.0/8
+        - 10.0.0.0/8
+        - 127.0.0.0/8
       includedCidr:
-      - 10.0.0.0/8
-      - 127.0.0.0/8
-      - 169.254.0.0/16
-      - 172.16.0.0/12
+        - 10.0.0.0/8
+        - 127.0.0.0/8
+        - 169.254.0.0/16
+        - 172.16.0.0/12
       useDefault: false
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_security_intrusion_info.py b/plugins/modules/networks_appliance_security_intrusion_info.py
index b08270d2a..9ffab0eb6 100644
--- a/plugins/modules/networks_appliance_security_intrusion_info.py
+++ b/plugins/modules/networks_appliance_security_intrusion_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_security_intrusion_info
-short_description: Information module for networks _appliance _security _intrusion
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _security _intrusion.
-- Returns all supported intrusion settings for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _security _intrusion.
+  - Returns all supported intrusion settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_security_intrusion_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_security_intrusion,
+  - Paths used are get /networks/{networkId}/appliance/security/intrusion,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSecurityIntrusion
-  description: Complete reference of the getNetworkApplianceSecurityIntrusion API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-security-intrusion
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_security_intrusion,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/security/intrusion,
+  - description: Complete reference of the getNetworkApplianceSecurityIntrusion API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-security-intrusion
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSecurityIntrusion
+short_description: Information module for networks _appliance _security _intrusion
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _security _intrusion
   cisco.meraki.networks_appliance_security_intrusion_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_security_malware.py b/plugins/modules/networks_appliance_security_malware.py
index 90247f131..753b8c2e9 100644
--- a/plugins/modules/networks_appliance_security_malware.py
+++ b/plugins/modules/networks_appliance_security_malware.py
@@ -5,21 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_security_malware
-short_description: Resource module for networks _appliance _security _malware
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _security _malware.
-- Set the supported malware settings for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _security _malware.
+  - Set the supported malware settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_security_malware
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_security_malware,
+  - Paths used are put /networks/{networkId}/appliance/security/malware,
 options:
   allowedFiles:
     description: The sha256 digests of files that should be permitted by the malware
-      detection engine. If omitted, the current config will remain unchanged. This is
-      available only if your network supports AMP allow listing.
+      detection engine. If omitted, the current config will remain unchanged. This
+      is available only if your network supports AMP allow listing.
     elements: dict
     suboptions:
       comment:
@@ -31,8 +31,8 @@
     type: list
   allowedUrls:
     description: The urls that should be permitted by the malware detection engine.
-      If omitted, the current config will remain unchanged. This is available only if
-      your network supports AMP allow listing.
+      If omitted, the current config will remain unchanged. This is available only
+      if your network supports AMP allow listing.
     elements: dict
     suboptions:
       comment:
@@ -49,53 +49,48 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSecurityMalware
-  description: Complete reference of the updateNetworkApplianceSecurityMalware API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-security-malware
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_security_malware,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/security/malware,
+  - description: Complete reference of the updateNetworkApplianceSecurityMalware API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-security-malware
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSecurityMalware
+short_description: Resource module for networks _appliance _security _malware
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_security_malware:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     allowedFiles:
-    - comment: allow ZIP file
-      sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
+      - comment: allow ZIP file
+        sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
     allowedUrls:
-    - comment: allow help.com.au
-      url: help.com.au
+      - comment: allow help.com.au
+        url: help.com.au
     mode: enabled
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_security_malware_info.py b/plugins/modules/networks_appliance_security_malware_info.py
index 272bbcd85..f439a6131 100644
--- a/plugins/modules/networks_appliance_security_malware_info.py
+++ b/plugins/modules/networks_appliance_security_malware_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_security_malware_info
-short_description: Information module for networks _appliance _security _malware
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _security _malware.
-- Returns all supported malware settings for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _security _malware.
+  - Returns all supported malware settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_security_malware_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_security_malware,
+  - Paths used are get /networks/{networkId}/appliance/security/malware,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSecurityMalware
-  description: Complete reference of the getNetworkApplianceSecurityMalware API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-security-malware
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_security_malware,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/security/malware,
+  - description: Complete reference of the getNetworkApplianceSecurityMalware API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-security-malware
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSecurityMalware
+short_description: Information module for networks _appliance _security _malware
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _security _malware
   cisco.meraki.networks_appliance_security_malware_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_settings.py b/plugins/modules/networks_appliance_settings.py
index c8fecc50c..71b460aca 100644
--- a/plugins/modules/networks_appliance_settings.py
+++ b/plugins/modules/networks_appliance_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_settings
-short_description: Resource module for networks _appliance _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _settings.
-- Update the appliance settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _settings.
+  - Update the appliance settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_settings
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_settings,
+  - Paths used are put /networks/{networkId}/appliance/settings,
 options:
   clientTrackingMethod:
     description: Client tracking method of a network.
@@ -36,43 +36,39 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSettings
-  description: Complete reference of the updateNetworkApplianceSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_settings,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/settings,
+  - description: Complete reference of the updateNetworkApplianceSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-settings
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSettings
+short_description: Resource module for networks _appliance _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     clientTrackingMethod: MAC address
     deploymentMode: routed
@@ -80,7 +76,6 @@
       enabled: true
       prefix: test
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_settings_info.py b/plugins/modules/networks_appliance_settings_info.py
index 96bc5d3e0..1cda6b80e 100644
--- a/plugins/modules/networks_appliance_settings_info.py
+++ b/plugins/modules/networks_appliance_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_settings_info
-short_description: Information module for networks _appliance _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _settings.
-- Return the appliance settings for a network.
-version_added: '2.16.0'
+  - Get all networks _appliance _settings.
+  - Return the appliance settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_settings_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_settings,
+  - Paths used are get /networks/{networkId}/appliance/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSettings
-  description: Complete reference of the getNetworkApplianceSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_settings,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/settings,
+  - description: Complete reference of the getNetworkApplianceSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-settings
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSettings
+short_description: Information module for networks _appliance _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _settings
   cisco.meraki.networks_appliance_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_single_lan.py b/plugins/modules/networks_appliance_single_lan.py
index f26c6826e..444cd5ae3 100644
--- a/plugins/modules/networks_appliance_single_lan.py
+++ b/plugins/modules/networks_appliance_single_lan.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_single_lan
-short_description: Resource module for networks _appliance _single _lan
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _single _lan.
-- Update single LAN configuration.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _single _lan.
+  - Update single LAN configuration.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_single_lan
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_single_lan,
+  - Paths used are put /networks/{networkId}/appliance/singleLan,
 options:
   applianceIp:
     description: The appliance IP address of the single LAN.
@@ -53,8 +53,9 @@
     type: dict
   mandatoryDhcp:
     description: Mandatory DHCP will enforce that clients connecting to this LAN must
-      use the IP address assigned by the DHCP server. Clients who use a static IP address
-      won't be able to associate. Only available on firmware versions 17.0 and above.
+      use the IP address assigned by the DHCP server. Clients who use a static IP
+      address won't be able to associate. Only available on firmware versions 17.0
+      and above.
     suboptions:
       enabled:
         description: Enable Mandatory DHCP on LAN.
@@ -67,60 +68,55 @@
     description: The subnet of the single LAN configuration.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSingleLan
-  description: Complete reference of the updateNetworkApplianceSingleLan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-single-lan
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_single_lan,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/singleLan,
+  - description: Complete reference of the updateNetworkApplianceSingleLan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-single-lan
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSingleLan
+short_description: Resource module for networks _appliance _single _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_single_lan:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     applianceIp: string
     ipv6:
       enabled: true
       prefixAssignments:
-      - autonomous: true
-        origin:
-          interfaces:
-          - string
-          type: string
-        staticApplianceIp6: string
-        staticPrefix: string
+        - autonomous: true
+          origin:
+            interfaces:
+              - string
+            type: string
+          staticApplianceIp6: string
+          staticPrefix: string
     mandatoryDhcp:
       enabled: true
     networkId: string
     subnet: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_single_lan_info.py b/plugins/modules/networks_appliance_single_lan_info.py
index bbe50a5da..59b9a16be 100644
--- a/plugins/modules/networks_appliance_single_lan_info.py
+++ b/plugins/modules/networks_appliance_single_lan_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_single_lan_info
-short_description: Information module for networks _appliance _single _lan
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _single _lan.
-- Return single LAN configuration.
-version_added: '2.16.0'
+  - Get all networks _appliance _single _lan.
+  - Return single LAN configuration.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_single_lan_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_single_lan,
+  - Paths used are get /networks/{networkId}/appliance/singleLan,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSingleLan
-  description: Complete reference of the getNetworkApplianceSingleLan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-single-lan
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_single_lan,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/singleLan,
+  - description: Complete reference of the getNetworkApplianceSingleLan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-single-lan
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSingleLan
+short_description: Information module for networks _appliance _single _lan
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _single _lan
   cisco.meraki.networks_appliance_single_lan_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_ssids.py b/plugins/modules/networks_appliance_ssids.py
index 26aa0602d..921eecec3 100644
--- a/plugins/modules/networks_appliance_ssids.py
+++ b/plugins/modules/networks_appliance_ssids.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_ssids
-short_description: Resource module for networks _appliance _ssids
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _ssids.
-- Update the attributes of an MX SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _ssids.
+  - Update the attributes of an MX SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_ssids
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_ssid,
+  - Paths used are put /networks/{networkId}/appliance/ssids/{number},
 options:
   authMode:
     description: The association control method for the SSID ('open', 'psk', '8021x-meraki'
@@ -26,8 +26,8 @@
     type: int
   dhcpEnforcedDeauthentication:
     description: DHCP Enforced Deauthentication enables the disassociation of wireless
-      clients in addition to Mandatory DHCP. This param is only valid on firmware versions
-      >= MX 17.0 where the associated LAN has Mandatory DHCP Enabled.
+      clients in addition to Mandatory DHCP. This param is only valid on firmware
+      versions >= MX 17.0 where the associated LAN has Mandatory DHCP Enabled.
     suboptions:
       enabled:
         description: Enable DCHP Enforced Deauthentication on the SSID.
@@ -47,8 +47,8 @@
     description: Whether or not the SSID is enabled.
     type: bool
   encryptionMode:
-    description: The psk encryption mode for the SSID ('wep' or 'wpa'). This param is
-      only valid if the authMode is 'psk'.
+    description: The psk encryption mode for the SSID ('wep' or 'wpa'). This param
+      is only valid if the authMode is 'psk'.
     type: str
   name:
     description: The name of the SSID.
@@ -82,49 +82,45 @@
     description: Boolean indicating whether the MX should advertise or hide this SSID.
     type: bool
   wpaEncryptionMode:
-    description: The types of WPA encryption. ('WPA1 and WPA2', 'WPA2 only', 'WPA3 Transition
-      Mode' or 'WPA3 only'). This param is only valid if (1) the authMode is 'psk' &
-      the encryptionMode is 'wpa' OR (2) the authMode is '8021x-meraki' OR (3) the authMode
-      is '8021x-radius'.
+    description: The types of WPA encryption. ('WPA1 and WPA2', 'WPA2 only', 'WPA3
+      Transition Mode' or 'WPA3 only'). This param is only valid if (1) the authMode
+      is 'psk' & the encryptionMode is 'wpa' OR (2) the authMode is '8021x-meraki'
+      OR (3) the authMode is '8021x-radius'.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceSsid
-  description: Complete reference of the updateNetworkApplianceSsid API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-ssid
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_ssid,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/ssids/{number},
+  - description: Complete reference of the updateNetworkApplianceSsid API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-ssid
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceSsid
+short_description: Resource module for networks _appliance _ssids
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_appliance_ssids:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     authMode: 8021x-radius
     defaultVlanId: 1
@@ -140,12 +136,11 @@
     number: string
     psk: psk
     radiusServers:
-    - host: 0.0.0.0
-      port: 1000
-      secret: secret
+      - host: 0.0.0.0
+        port: 1000
+        secret: secret
     visible: true
     wpaEncryptionMode: WPA2 only
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_ssids_info.py b/plugins/modules/networks_appliance_ssids_info.py
index 86d6d7307..4b8650ceb 100644
--- a/plugins/modules/networks_appliance_ssids_info.py
+++ b/plugins/modules/networks_appliance_ssids_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_ssids_info
-short_description: Information module for networks _appliance _ssids
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _ssids.
-- Get networks _appliance _ssids by id.
-- List the MX SSIDs in a network.
-- Return a single MX SSID.
-version_added: '2.16.0'
+  - Get all networks _appliance _ssids.
+  - Get networks _appliance _ssids by id.
+  - List the MX SSIDs in a network.
+  - Return a single MX SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_ssids_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_ssid, appliance.Appliance.get_network_appliance_ssids,
+  - Paths used are get /networks/{networkId}/appliance/ssids, get /networks/{networkId}/appliance/ssids/{number},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSsid
-  description: Complete reference of the getNetworkApplianceSsid API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ssid
-- name: Cisco Meraki documentation for appliance getNetworkApplianceSsids
-  description: Complete reference of the getNetworkApplianceSsids API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ssids
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_ssid,
-    appliance.Appliance.get_network_appliance_ssids,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/ssids,
-    get /networks/{networkId}/appliance/ssids/{number},
+  - description: Complete reference of the getNetworkApplianceSsid API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ssid
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSsid
+  - description: Complete reference of the getNetworkApplianceSsids API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-ssids
+    name: Cisco Meraki documentation for appliance getNetworkApplianceSsids
+short_description: Information module for networks _appliance _ssids
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _ssids
   cisco.meraki.networks_appliance_ssids_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _appliance _ssids by id
   cisco.meraki.networks_appliance_ssids_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping.py b/plugins/modules/networks_appliance_traffic_shaping.py
index e57d837ba..4f65c5cfc 100644
--- a/plugins/modules/networks_appliance_traffic_shaping.py
+++ b/plugins/modules/networks_appliance_traffic_shaping.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping
-short_description: Resource module for networks _appliance _traffic _shaping
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _traffic _shaping.
-- Update the traffic shaping settings for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _traffic _shaping.
+  - Update the traffic shaping settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_traffic_shaping,
+  - Paths used are put /networks/{networkId}/appliance/trafficShaping,
 options:
   globalBandwidthLimits:
     description: Global per-client bandwidth limit.
@@ -30,49 +30,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShaping
-  description: Complete reference of the updateNetworkApplianceTrafficShaping API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_traffic_shaping,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/trafficShaping,
+  - description: Complete reference of the updateNetworkApplianceTrafficShaping API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShaping
+short_description: Resource module for networks _appliance _traffic _shaping
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_traffic_shaping:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     globalBandwidthLimits:
       limitDown: 5120
       limitUp: 2048
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes.py b/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes.py
index 50e087bc5..25c12b059 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_custom_performance_classes
-short_description: Resource module for networks _appliance _traffic _shaping _custom _performance _classes
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _appliance _traffic _shaping _custom _performance _classes.
-- Add a custom performance class for an MX network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _appliance _traffic _shaping
+    _custom _performance _classes.
+  - Add a custom performance class for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_custom_performance_classes
+notes:
+  - SDK Method used are appliance.Appliance.create_network_appliance_traffic_shaping_custom_performance_class,
+  - Paths used are post /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses,
 options:
   maxJitter:
     description: Maximum jitter in milliseconds.
@@ -32,50 +33,47 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance createNetworkApplianceTrafficShapingCustomPerformanceClass
-  description: Complete reference of the createNetworkApplianceTrafficShapingCustomPerformanceClass API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-traffic-shaping-custom-performance-class
-notes:
-  - SDK Method used are
-    appliance.Appliance.create_network_appliance_traffic_shaping_custom_performance_class,
-
-  - Paths used are
-    post /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses,
+  - description: Complete reference of the createNetworkApplianceTrafficShapingCustomPerformanceClass
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-traffic-shaping-custom-performance-class
+    name: Cisco Meraki documentation for appliance createNetworkApplianceTrafficShapingCustomPerformanceClass
+short_description: Resource module for networks _appliance _traffic _shaping _custom
+  _performance _classes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_appliance_traffic_shaping_custom_performance_classes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     maxJitter: 100
     maxLatency: 100
     maxLossPercentage: 5
     name: myCustomPerformanceClass
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes_info.py b/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes_info.py
index 1ddc6608d..6af2e646c 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes_info.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_custom_performance_classes_info.py
@@ -5,102 +5,100 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_custom_performance_classes_info
-short_description: Information module for networks _appliance _traffic _shaping _custom _performance _classes
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _traffic _shaping _custom _performance _classes.
-- Get networks _appliance _traffic _shaping _custom _performance _classes by id.
-- List all custom performance classes for an MX network.
-- Return a custom performance class for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _traffic _shaping _custom _performance _classes.
+  - Get networks _appliance _traffic _shaping _custom _performance _classes by id.
+  - List all custom performance classes for an MX network.
+  - Return a custom performance class for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_custom_performance_classes_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_traffic_shaping_custom_performance_class,
+    appliance.Appliance.get_network_appliance_traffic_shaping_custom_performance_classes,
+  - Paths used are get /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses,
+    get /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses/{customPerformanceClassId},
 options:
+  customPerformanceClassId:
+    description:
+      - CustomPerformanceClassId path parameter. Custom performance class ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  customPerformanceClassId:
-    description:
-    - CustomPerformanceClassId path parameter. Custom performance class ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingCustomPerformanceClass
-  description: Complete reference of the getNetworkApplianceTrafficShapingCustomPerformanceClass API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-custom-performance-class
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingCustomPerformanceClasses
-  description: Complete reference of the getNetworkApplianceTrafficShapingCustomPerformanceClasses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-custom-performance-classes
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_traffic_shaping_custom_performance_class,
-    appliance.Appliance.get_network_appliance_traffic_shaping_custom_performance_classes,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses,
-    get /networks/{networkId}/appliance/trafficShaping/customPerformanceClasses/{customPerformanceClassId},
+  - description: Complete reference of the getNetworkApplianceTrafficShapingCustomPerformanceClass
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-custom-performance-class
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingCustomPerformanceClass
+  - description: Complete reference of the getNetworkApplianceTrafficShapingCustomPerformanceClasses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-custom-performance-classes
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingCustomPerformanceClasses
+short_description: Information module for networks _appliance _traffic _shaping _custom
+  _performance _classes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _traffic _shaping _custom _performance _classes
   cisco.meraki.networks_appliance_traffic_shaping_custom_performance_classes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
-- name: Get networks _appliance _traffic _shaping _custom _performance _classes by id
+- name: Get networks _appliance _traffic _shaping _custom _performance _classes by
+    id
   cisco.meraki.networks_appliance_traffic_shaping_custom_performance_classes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     customPerformanceClassId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_info.py b/plugins/modules/networks_appliance_traffic_shaping_info.py
index 10e06156e..23f8699c5 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_info.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_info
-short_description: Information module for networks _appliance _traffic _shaping
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _traffic _shaping.
-- Display the traffic shaping settings for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _traffic _shaping.
+  - Display the traffic shaping settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_traffic_shaping,
+  - Paths used are get /networks/{networkId}/appliance/trafficShaping,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShaping
-  description: Complete reference of the getNetworkApplianceTrafficShaping API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_traffic_shaping,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/trafficShaping,
+  - description: Complete reference of the getNetworkApplianceTrafficShaping API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShaping
+short_description: Information module for networks _appliance _traffic _shaping
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _traffic _shaping
   cisco.meraki.networks_appliance_traffic_shaping_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_rules.py b/plugins/modules/networks_appliance_traffic_shaping_rules.py
index e727ec317..4008b26b9 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_rules.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_rules
-short_description: Resource module for networks _appliance _traffic _shaping _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _traffic _shaping _rules.
-- Update the traffic shaping settings rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _traffic _shaping
+    _rules.
+  - Update the traffic shaping settings rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_traffic_shaping_rules,
+  - Paths used are put /networks/{networkId}/appliance/trafficShaping/rules,
 options:
   defaultRulesEnabled:
     description: Whether default traffic shaping rules are enabled (true) or disabled
@@ -25,14 +26,14 @@
     description: NetworkId path parameter. Network ID.
     type: str
   rules:
-    description: An array of traffic shaping rules. Rules are applied in the order that
-      they are specified in. An empty list (or null) means no rules. Note that you are
-      allowed a maximum of 8 rules.
+    description: An array of traffic shaping rules. Rules are applied in the order
+      that they are specified in. An empty list (or null) means no rules. Note that
+      you are allowed a maximum of 8 rules.
     elements: dict
     suboptions:
       definitions:
-        description: A list of objects describing the definitions of your traffic shaping
-          rule. At least one definition is required.
+        description: A list of objects describing the definitions of your traffic
+          shaping rule. At least one definition is required.
         elements: dict
         suboptions:
           type:
@@ -42,17 +43,18 @@
           value:
             description: If "type" is 'host', 'port', 'ipRange' or 'localNet', then
               "value" must be a string, matching either a hostname (e.g. "somesite.com"),
-              a port (e.g. 8080), or an IP range ("192.1.0.0", "192.1.0.0/16", or "10.1.0.0/16
-              80"). 'localNet' also supports CIDR notation, excluding custom ports.
-              If "type" is 'application' or 'applicationCategory', then "value" must
-              be an object with the structure { "id" "meraki layer7/..." }, where "id"
-              is the application category or application ID (for a list of IDs for your
-              network, use the trafficShaping/applicationCategories endpoint).
+              a port (e.g. 8080), or an IP range ("192.1.0.0", "192.1.0.0/16", or
+              "10.1.0.0/16 80"). 'localNet' also supports CIDR notation, excluding
+              custom ports. If "type" is 'application' or 'applicationCategory', then
+              "value" must be an object with the structure { "id" "meraki layer7/..."
+              }, where "id" is the application category or application ID (for a list
+              of IDs for your network, use the trafficShaping/applicationCategories
+              endpoint).
             type: str
         type: list
       dscpTagValue:
-        description: The DSCP tag applied by your rule. Null means 'Do not change DSCP
-          tag'. For a list of possible tag values, use the trafficShaping/dscpTaggingOptions
+        description: The DSCP tag applied by your rule. Null means 'Do not change
+          DSCP tag'. For a list of possible tag values, use the trafficShaping/dscpTaggingOptions
           endpoint.
         type: int
       perClientBandwidthLimits:
@@ -60,8 +62,8 @@
         suboptions:
           bandwidthLimits:
             description: The bandwidth limits object, specifying the upload ('limitUp')
-              and download ('limitDown') speed in Kbps. These are only enforced if 'settings'
-              is set to 'custom'.
+              and download ('limitDown') speed in Kbps. These are only enforced if
+              'settings' is set to 'custom'.
             suboptions:
               limitDown:
                 description: The maximum download limit (integer, in Kbps).
@@ -71,78 +73,74 @@
                 type: int
             type: dict
           settings:
-            description: How bandwidth limits are applied by your rule. Can be one of
-              'network default', 'ignore' or 'custom'.
+            description: How bandwidth limits are applied by your rule. Can be one
+              of 'network default', 'ignore' or 'custom'.
             type: str
         type: dict
       priority:
-        description: A string, indicating the priority level for packets bound to your
-          rule. Can be 'low', 'normal' or 'high'.
+        description: A string, indicating the priority level for packets bound to
+          your rule. Can be 'low', 'normal' or 'high'.
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingRules
-  description: Complete reference of the updateNetworkApplianceTrafficShapingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_traffic_shaping_rules,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/trafficShaping/rules,
+  - description: Complete reference of the updateNetworkApplianceTrafficShapingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-rules
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingRules
+short_description: Resource module for networks _appliance _traffic _shaping _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_traffic_shaping_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultRulesEnabled: true
     networkId: string
     rules:
-    - definitions:
-      - type: host
-        value: google.com
-      - type: port
-        value: '9090'
-      - type: ipRange
-        value: 192.1.0.0
-      - type: ipRange
-        value: 192.1.0.0/16
-      - type: ipRange
-        value: 10.1.0.0/16:80
-      - type: localNet
-        value: 192.168.0.0/16
-      dscpTagValue: 0
-      perClientBandwidthLimits:
-        bandwidthLimits:
-          limitDown: 1000000
-          limitUp: 1000000
-        settings: custom
-      priority: normal
-
+      - definitions:
+          - type: host
+            value: google.com
+          - type: port
+            value: '9090'
+          - type: ipRange
+            value: 192.1.0.0
+          - type: ipRange
+            value: 192.1.0.0/16
+          - type: ipRange
+            value: 10.1.0.0/16:80
+          - type: localNet
+            value: 192.168.0.0/16
+        dscpTagValue: 0
+        perClientBandwidthLimits:
+          bandwidthLimits:
+            limitDown: 1000000
+            limitUp: 1000000
+          settings: custom
+        priority: normal
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_rules_info.py b/plugins/modules/networks_appliance_traffic_shaping_rules_info.py
index 0a6e3fa85..2cfd695fd 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_rules_info.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_rules_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_rules_info
-short_description: Information module for networks _appliance _traffic _shaping _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _traffic _shaping _rules.
-- Display the traffic shaping settings rules for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _traffic _shaping _rules.
+  - Display the traffic shaping settings rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_traffic_shaping_rules,
+  - Paths used are get /networks/{networkId}/appliance/trafficShaping/rules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingRules
-  description: Complete reference of the getNetworkApplianceTrafficShapingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_traffic_shaping_rules,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/trafficShaping/rules,
+  - description: Complete reference of the getNetworkApplianceTrafficShapingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-rules
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingRules
+short_description: Information module for networks _appliance _traffic _shaping _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _traffic _shaping _rules
   cisco.meraki.networks_appliance_traffic_shaping_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth.py b/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth.py
index e14cbb1da..4d9dba6d1 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_uplink_bandwidth
-short_description: Resource module for networks _appliance _traffic _shaping _uplink _bandwidth
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _traffic _shaping _uplink _bandwidth.
-- Updates the uplink bandwidth settings for your MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _traffic _shaping
+    _uplink _bandwidth.
+  - Updates the uplink bandwidth settings for your MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_uplink_bandwidth
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_traffic_shaping_uplink_bandwidth,
+  - Paths used are put /networks/{networkId}/appliance/trafficShaping/uplinkBandwidth,
 options:
   bandwidthLimits:
     description: A mapping of uplinks to their bandwidth settings (be sure to check
@@ -61,43 +62,41 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingUplinkBandwidth
-  description: Complete reference of the updateNetworkApplianceTrafficShapingUplinkBandwidth API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-uplink-bandwidth
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_traffic_shaping_uplink_bandwidth,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/trafficShaping/uplinkBandwidth,
+  - description: Complete reference of the updateNetworkApplianceTrafficShapingUplinkBandwidth
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-uplink-bandwidth
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingUplinkBandwidth
+short_description: Resource module for networks _appliance _traffic _shaping _uplink
+  _bandwidth
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_traffic_shaping_uplink_bandwidth:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bandwidthLimits:
       cellular:
@@ -110,7 +109,6 @@
         limitDown: 1000000
         limitUp: 1000000
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth_info.py b/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth_info.py
index be23a5458..6c67b183f 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth_info.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_uplink_bandwidth_info.py
@@ -5,68 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_uplink_bandwidth_info
-short_description: Information module for networks _appliance _traffic _shaping _uplink _bandwidth
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _traffic _shaping _uplink _bandwidth.
-- >
-   Returns the uplink bandwidth limits for your MX network. This may not reflect the affected device's hardware
-   capabilities. For more information on your device's hardware capabilities, please consult our MX Family Datasheet
-   - https //meraki.cisco.com/product-collateral/mx-family-datasheet/?file .
-version_added: '2.16.0'
+  - Get all networks _appliance _traffic _shaping _uplink _bandwidth.
+  - 'Returns the uplink bandwidth limits for your MX network. This may not reflect
+    the affected device''s hardware capabilities. For more information on your device''s
+    hardware capabilities, please consult our MX Family Datasheet - https //meraki.cisco.com/product-collateral/mx-family-datasheet/?file
+    .
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_uplink_bandwidth_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_traffic_shaping_uplink_bandwidth,
+  - Paths used are get /networks/{networkId}/appliance/trafficShaping/uplinkBandwidth,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingUplinkBandwidth
-  description: Complete reference of the getNetworkApplianceTrafficShapingUplinkBandwidth API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-bandwidth
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_traffic_shaping_uplink_bandwidth,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/trafficShaping/uplinkBandwidth,
+  - description: Complete reference of the getNetworkApplianceTrafficShapingUplinkBandwidth
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-bandwidth
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingUplinkBandwidth
+short_description: Information module for networks _appliance _traffic _shaping _uplink
+  _bandwidth
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _traffic _shaping _uplink _bandwidth
   cisco.meraki.networks_appliance_traffic_shaping_uplink_bandwidth_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_uplink_selection.py b/plugins/modules/networks_appliance_traffic_shaping_uplink_selection.py
index 0074870bd..9609d698c 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_uplink_selection.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_uplink_selection.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_uplink_selection
-short_description: Resource module for networks _appliance _traffic _shaping _uplink _selection
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _traffic _shaping _uplink _selection.
-- Update uplink selection settings for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _traffic _shaping
+    _uplink _selection.
+  - Update uplink selection settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_uplink_selection
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_traffic_shaping_uplink_selection,
+  - Paths used are put /networks/{networkId}/appliance/trafficShaping/uplinkSelection,
 options:
   activeActiveAutoVpnEnabled:
     description: Toggle for enabling or disabling active-active AutoVPN.
@@ -46,8 +47,8 @@
     elements: dict
     suboptions:
       failOverCriterion:
-        description: Fail over criterion for this uplink preference rule. Must be one
-          of 'poorPerformance' or 'uplinkDown'.
+        description: Fail over criterion for this uplink preference rule. Must be
+          one of 'poorPerformance' or 'uplinkDown'.
         type: str
       performanceClass:
         description: Performance class setting for this uplink preference rule.
@@ -61,13 +62,13 @@
               performanceClass type is 'custom'.
             type: str
           type:
-            description: Type of this performance class. Must be one of 'builtin' or
-              'custom'.
+            description: Type of this performance class. Must be one of 'builtin'
+              or 'custom'.
             type: str
         type: dict
       preferredUplink:
-        description: Preferred uplink for this uplink preference rule. Must be one of
-          'wan1', 'wan2', 'bestForVoIP', 'loadBalancing' or 'defaultUplink'.
+        description: Preferred uplink for this uplink preference rule. Must be one
+          of 'wan1', 'wan2', 'bestForVoIP', 'loadBalancing' or 'defaultUplink'.
         type: str
       trafficFilters:
         description: Array of traffic filters for this uplink preference rule.
@@ -98,9 +99,10 @@
                       under a template network.
                     type: int
                   network:
-                    description: Meraki network ID. Currently only available under a
-                      template network, and the value should be ID of either same template
-                      network, or another template network currently. E.g. "L_12345678".
+                    description: Meraki network ID. Currently only available under
+                      a template network, and the value should be ID of either same
+                      template network, or another template network currently. E.g.
+                      "L_12345678".
                     type: str
                   port:
                     description: E.g. "any", "0" (also means "any"), "8080", "1-1024".
@@ -115,8 +117,8 @@
                   filter. E.g. "meraki layer7/category/1", "meraki layer7/application/4".
                 type: str
               protocol:
-                description: Protocol of this custom type traffic filter. Must be one
-                  of 'tcp', 'udp', 'icmp', 'icmp6' or 'any'.
+                description: Protocol of this custom type traffic filter. Must be
+                  one of 'tcp', 'udp', 'icmp', 'icmp6' or 'any'.
                 type: str
               source:
                 description: Source of this custom type traffic filter.
@@ -132,9 +134,10 @@
                       under a template network.
                     type: int
                   network:
-                    description: Meraki network ID. Currently only available under a
-                      template network, and the value should be ID of either same template
-                      network, or another template network currently. E.g. "L_12345678".
+                    description: Meraki network ID. Currently only available under
+                      a template network, and the value should be ID of either same
+                      template network, or another template network currently. E.g.
+                      "L_12345678".
                     type: str
                   port:
                     description: E.g. "any", "0" (also means "any"), "8080", "1-1024".
@@ -152,8 +155,8 @@
     elements: dict
     suboptions:
       preferredUplink:
-        description: Preferred uplink for this uplink preference rule. Must be one of
-          'wan1' or 'wan2'.
+        description: Preferred uplink for this uplink preference rule. Must be one
+          of 'wan1' or 'wan2'.
         type: str
       trafficFilters:
         description: Array of traffic filters for this uplink preference rule.
@@ -178,8 +181,8 @@
                     type: str
                 type: dict
               protocol:
-                description: Protocol of this custom type traffic filter. Must be one
-                  of 'tcp', 'udp', 'icmp6' or 'any'.
+                description: Protocol of this custom type traffic filter. Must be
+                  one of 'tcp', 'udp', 'icmp6' or 'any'.
                 type: str
               source:
                 description: Source of this custom type traffic filter.
@@ -206,43 +209,41 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingUplinkSelection
-  description: Complete reference of the updateNetworkApplianceTrafficShapingUplinkSelection API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-uplink-selection
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_traffic_shaping_uplink_selection,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/trafficShaping/uplinkSelection,
+  - description: Complete reference of the updateNetworkApplianceTrafficShapingUplinkSelection
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-uplink-selection
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingUplinkSelection
+short_description: Resource module for networks _appliance _traffic _shaping _uplink
+  _selection
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_traffic_shaping_uplink_selection:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     activeActiveAutoVpnEnabled: true
     defaultUplink: wan1
@@ -252,45 +253,44 @@
     loadBalancingEnabled: true
     networkId: string
     vpnTrafficUplinkPreferences:
-    - failOverCriterion: poorPerformance
-      performanceClass:
-        builtinPerformanceClassName: VoIP
-        customPerformanceClassId: '123456'
-        type: custom
-      preferredUplink: bestForVoIP
-      trafficFilters:
-      - type: applicationCategory
-        value:
-          destination:
-            cidr: any
-            fqdn: www.google.com
-            host: 254
-            network: L_12345678
-            port: 1-1024
-            vlan: 10
-          id: meraki:layer7/category/1
-          protocol: tcp
-          source:
-            cidr: 192.168.1.0/24
-            host: 200
-            network: L_23456789
-            port: any
-            vlan: 20
+      - failOverCriterion: poorPerformance
+        performanceClass:
+          builtinPerformanceClassName: VoIP
+          customPerformanceClassId: '123456'
+          type: custom
+        preferredUplink: bestForVoIP
+        trafficFilters:
+          - type: applicationCategory
+            value:
+              destination:
+                cidr: any
+                fqdn: www.google.com
+                host: 254
+                network: L_12345678
+                port: 1-1024
+                vlan: 10
+              id: meraki:layer7/category/1
+              protocol: tcp
+              source:
+                cidr: 192.168.1.0/24
+                host: 200
+                network: L_23456789
+                port: any
+                vlan: 20
     wanTrafficUplinkPreferences:
-    - preferredUplink: wan1
-      trafficFilters:
-      - type: custom
-        value:
-          destination:
-            cidr: any
-            port: any
-          protocol: tcp
-          source:
-            cidr: 192.168.1.0/24
-            host: 254
-            port: 1-1024
-            vlan: 10
-
+      - preferredUplink: wan1
+        trafficFilters:
+          - type: custom
+            value:
+              destination:
+                cidr: any
+                port: any
+              protocol: tcp
+              source:
+                cidr: 192.168.1.0/24
+                host: 254
+                port: 1-1024
+                vlan: 10
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_uplink_selection_info.py b/plugins/modules/networks_appliance_traffic_shaping_uplink_selection_info.py
index b99d8b515..2718f27ac 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_uplink_selection_info.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_uplink_selection_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_uplink_selection_info
-short_description: Information module for networks _appliance _traffic _shaping _uplink _selection
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _traffic _shaping _uplink _selection.
-- Show uplink selection settings for an MX network.
-version_added: '2.16.0'
+  - Get all networks _appliance _traffic _shaping _uplink _selection.
+  - Show uplink selection settings for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_uplink_selection_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_traffic_shaping_uplink_selection,
+  - Paths used are get /networks/{networkId}/appliance/trafficShaping/uplinkSelection,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingUplinkSelection
-  description: Complete reference of the getNetworkApplianceTrafficShapingUplinkSelection API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-selection
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_traffic_shaping_uplink_selection,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/trafficShaping/uplinkSelection,
+  - description: Complete reference of the getNetworkApplianceTrafficShapingUplinkSelection
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-selection
+    name: Cisco Meraki documentation for appliance getNetworkApplianceTrafficShapingUplinkSelection
+short_description: Information module for networks _appliance _traffic _shaping _uplink
+  _selection
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _traffic _shaping _uplink _selection
   cisco.meraki.networks_appliance_traffic_shaping_uplink_selection_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_traffic_shaping_vpn_exclusions.py b/plugins/modules/networks_appliance_traffic_shaping_vpn_exclusions.py
index 30008b203..cf9a09d9e 100644
--- a/plugins/modules/networks_appliance_traffic_shaping_vpn_exclusions.py
+++ b/plugins/modules/networks_appliance_traffic_shaping_vpn_exclusions.py
@@ -5,19 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_traffic_shaping_vpn_exclusions
-short_description: Resource module for networks _appliance _traffic _shaping _vpn _exclusions
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _traffic _shaping _vpn _exclusions.
-- Update VPN exclusion rules for an MX network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _traffic _shaping
+    _vpn _exclusions.
+  - Update VPN exclusion rules for an MX network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_traffic_shaping_vpn_exclusions
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_traffic_shaping_vpn_exclusions,
+  - Paths used are put /networks/{networkId}/appliance/trafficShaping/vpnExclusions,
 options:
   custom:
-    description: Custom VPN exclusion rules. Pass an empty array to clear existing rules.
+    description: Custom VPN exclusion rules. Pass an empty array to clear existing
+      rules.
     elements: dict
     suboptions:
       destination:
@@ -31,8 +33,8 @@
         type: str
     type: list
   majorApplications:
-    description: Major Application based VPN exclusion rules. Pass an empty array to
-      clear existing rules.
+    description: Major Application based VPN exclusion rules. Pass an empty array
+      to clear existing rules.
     elements: dict
     suboptions:
       id:
@@ -46,52 +48,49 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingVpnExclusions
-  description: Complete reference of the updateNetworkApplianceTrafficShapingVpnExclusions API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-vpn-exclusions
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_traffic_shaping_vpn_exclusions,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/trafficShaping/vpnExclusions,
+  - description: Complete reference of the updateNetworkApplianceTrafficShapingVpnExclusions
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-vpn-exclusions
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceTrafficShapingVpnExclusions
+short_description: Resource module for networks _appliance _traffic _shaping _vpn
+  _exclusions
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_traffic_shaping_vpn_exclusions:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     custom:
-    - destination: 192.168.3.0/24
-      port: '8000'
-      protocol: tcp
+      - destination: 192.168.3.0/24
+        port: '8000'
+        protocol: tcp
     majorApplications:
-    - id: meraki:vpnExclusion/application/2
-      name: Office 365 Sharepoint
+      - id: meraki:vpnExclusion/application/2
+        name: Office 365 Sharepoint
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vlans.py b/plugins/modules/networks_appliance_vlans.py
index 82e06790f..3bcfadc30 100644
--- a/plugins/modules/networks_appliance_vlans.py
+++ b/plugins/modules/networks_appliance_vlans.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vlans
-short_description: Resource module for networks _appliance _vlans
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _appliance _vlans.
-- Add a VLAN.
-- Delete a VLAN from a network.
-- Update a VLAN.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _appliance
+    _vlans.
+  - Add a VLAN.
+  - Delete a VLAN from a network.
+  - Update a VLAN.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vlans
+notes:
+  - SDK Method used are appliance.Appliance.create_network_appliance_vlan, appliance.Appliance.delete_network_appliance_vlan,
+    appliance.Appliance.update_network_appliance_vlan,
+  - Paths used are post /networks/{networkId}/appliance/vlans, delete /networks/{networkId}/appliance/vlans/{vlanId},
+    put /networks/{networkId}/appliance/vlans/{vlanId},
 options:
   applianceIp:
     description: The local IP of the appliance on the VLAN.
@@ -30,8 +33,8 @@
     description: DHCP boot option for boot filename.
     type: str
   dhcpBootNextServer:
-    description: DHCP boot option to direct boot clients to the server to load the boot
-      file from.
+    description: DHCP boot option to direct boot clients to the server to load the
+      boot file from.
     type: str
   dhcpBootOptionsEnabled:
     description: Use DHCP boot options specified in other properties.
@@ -41,13 +44,13 @@
       a DHCP server', 'Relay DHCP to another server' or 'Do not respond to DHCP requests'.
     type: str
   dhcpLeaseTime:
-    description: The term of DHCP leases if the appliance is running a DHCP server on
-      this VLAN. One of '30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1
-      week'.
+    description: The term of DHCP leases if the appliance is running a DHCP server
+      on this VLAN. One of '30 minutes', '1 hour', '4 hours', '12 hours', '1 day'
+      or '1 week'.
     type: str
   dhcpOptions:
-    description: The list of DHCP options that will be included in DHCP responses. Each
-      object in the list should have "code", "type", and "value" properties.
+    description: The list of DHCP options that will be included in DHCP responses.
+      Each object in the list should have "code", "type", and "value" properties.
     elements: dict
     suboptions:
       code:
@@ -62,7 +65,8 @@
         type: str
     type: list
   dhcpRelayServerIps:
-    description: The IPs of the DHCP servers that DHCP requests should be relayed to.
+    description: The IPs of the DHCP servers that DHCP requests should be relayed
+      to.
     elements: str
     type: list
   dnsNameservers:
@@ -114,9 +118,10 @@
         type: list
     type: dict
   mandatoryDhcp:
-    description: Mandatory DHCP will enforce that clients connecting to this VLAN must
-      use the IP address assigned by the DHCP server. Clients who use a static IP address
-      won't be able to associate. Only available on firmware versions 17.0 and above.
+    description: Mandatory DHCP will enforce that clients connecting to this VLAN
+      must use the IP address assigned by the DHCP server. Clients who use a static
+      IP address won't be able to associate. Only available on firmware versions 17.0
+      and above.
     suboptions:
       enabled:
         description: Enable Mandatory DHCP on VLAN.
@@ -160,53 +165,45 @@
       on the VLAN.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance createNetworkApplianceVlan
-  description: Complete reference of the createNetworkApplianceVlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-vlan
-- name: Cisco Meraki documentation for appliance deleteNetworkApplianceVlan
-  description: Complete reference of the deleteNetworkApplianceVlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-appliance-vlan
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceVlan
-  description: Complete reference of the updateNetworkApplianceVlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vlan
-notes:
-  - SDK Method used are
-    appliance.Appliance.create_network_appliance_vlan,
-    appliance.Appliance.delete_network_appliance_vlan,
-    appliance.Appliance.update_network_appliance_vlan,
-
-  - Paths used are
-    post /networks/{networkId}/appliance/vlans,
-    delete /networks/{networkId}/appliance/vlans/{vlanId},
-    put /networks/{networkId}/appliance/vlans/{vlanId},
+  - description: Complete reference of the createNetworkApplianceVlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-appliance-vlan
+    name: Cisco Meraki documentation for appliance createNetworkApplianceVlan
+  - description: Complete reference of the deleteNetworkApplianceVlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-appliance-vlan
+    name: Cisco Meraki documentation for appliance deleteNetworkApplianceVlan
+  - description: Complete reference of the updateNetworkApplianceVlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vlan
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceVlan
+short_description: Resource module for networks _appliance _vlans
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_appliance_vlans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     applianceIp: 192.168.1.2
     cidr: 192.168.1.0/24
@@ -214,21 +211,21 @@
     dhcpHandling: Run a DHCP server
     dhcpLeaseTime: 30 minutes
     dhcpOptions:
-    - code: '3'
-      type: text
-      value: five
+      - code: '3'
+        type: text
+        value: five
     groupPolicyId: '101'
     id: '1234'
     ipv6:
       enabled: true
       prefixAssignments:
-      - autonomous: false
-        origin:
-          interfaces:
-          - wan0
-          type: internet
-        staticApplianceIp6: 2001:db8:3c4d:15::1
-        staticPrefix: 2001:db8:3c4d:15::/64
+        - autonomous: false
+          origin:
+            interfaces:
+              - wan0
+            type: internet
+          staticApplianceIp6: 2001:db8:3c4d:15::1
+          staticPrefix: 2001:db8:3c4d:15::/64
     mandatoryDhcp:
       enabled: true
     mask: 28
@@ -236,55 +233,53 @@
     networkId: string
     subnet: 192.168.1.0/24
     templateVlanType: same
-
 - name: Delete by id
   cisco.meraki.networks_appliance_vlans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     vlanId: string
-
 - name: Update by id
   cisco.meraki.networks_appliance_vlans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     adaptivePolicyGroupId: '1234'
     applianceIp: 192.168.1.2
@@ -295,12 +290,12 @@
     dhcpHandling: Run a DHCP server
     dhcpLeaseTime: 1 day
     dhcpOptions:
-    - code: '5'
-      type: text
-      value: five
+      - code: '5'
+        type: text
+        value: five
     dhcpRelayServerIps:
-    - 192.168.1.0/24
-    - 192.168.128.0/24
+      - 192.168.1.0/24
+      - 192.168.128.0/24
     dnsNameservers: google_dns
     fixedIpAssignments:
       22:33:44:55:66:77:
@@ -310,27 +305,26 @@
     ipv6:
       enabled: true
       prefixAssignments:
-      - autonomous: false
-        origin:
-          interfaces:
-          - wan0
-          type: internet
-        staticApplianceIp6: 2001:db8:3c4d:15::1
-        staticPrefix: 2001:db8:3c4d:15::/64
+        - autonomous: false
+          origin:
+            interfaces:
+              - wan0
+            type: internet
+          staticApplianceIp6: 2001:db8:3c4d:15::1
+          staticPrefix: 2001:db8:3c4d:15::/64
     mandatoryDhcp:
       enabled: true
     mask: 28
     name: My VLAN
     networkId: string
     reservedIpRanges:
-    - comment: A reserved IP range
-      end: 192.168.1.1
-      start: 192.168.1.0
+      - comment: A reserved IP range
+        end: 192.168.1.1
+        start: 192.168.1.0
     subnet: 192.168.1.0/24
     templateVlanType: same
     vlanId: string
     vpnNatSubnet: 192.168.1.0/24
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vlans_info.py b/plugins/modules/networks_appliance_vlans_info.py
index 6274223e3..0b143884c 100644
--- a/plugins/modules/networks_appliance_vlans_info.py
+++ b/plugins/modules/networks_appliance_vlans_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vlans_info
-short_description: Information module for networks _appliance _vlans
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _vlans.
-- Get networks _appliance _vlans by id.
-- List the VLANs for an MX network.
-- Return a VLAN.
-version_added: '2.16.0'
+  - Get all networks _appliance _vlans.
+  - Get networks _appliance _vlans by id.
+  - List the VLANs for an MX network.
+  - Return a VLAN.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vlans_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_vlan, appliance.Appliance.get_network_appliance_vlans,
+  - Paths used are get /networks/{networkId}/appliance/vlans, get /networks/{networkId}/appliance/vlans/{vlanId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   vlanId:
     description:
-    - VlanId path parameter. Vlan ID.
+      - VlanId path parameter. Vlan ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceVlan
-  description: Complete reference of the getNetworkApplianceVlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlan
-- name: Cisco Meraki documentation for appliance getNetworkApplianceVlans
-  description: Complete reference of the getNetworkApplianceVlans API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlans
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_vlan,
-    appliance.Appliance.get_network_appliance_vlans,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/vlans,
-    get /networks/{networkId}/appliance/vlans/{vlanId},
+  - description: Complete reference of the getNetworkApplianceVlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlan
+    name: Cisco Meraki documentation for appliance getNetworkApplianceVlan
+  - description: Complete reference of the getNetworkApplianceVlans API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlans
+    name: Cisco Meraki documentation for appliance getNetworkApplianceVlans
+short_description: Information module for networks _appliance _vlans
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _vlans
   cisco.meraki.networks_appliance_vlans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _appliance _vlans by id
   cisco.meraki.networks_appliance_vlans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     vlanId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vlans_settings.py b/plugins/modules/networks_appliance_vlans_settings.py
index b106cf31d..c6b5d3d99 100644
--- a/plugins/modules/networks_appliance_vlans_settings.py
+++ b/plugins/modules/networks_appliance_vlans_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vlans_settings
-short_description: Resource module for networks _appliance _vlans _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _vlans _settings.
-- Enable/Disable VLANs for the given network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _vlans _settings.
+  - Enable/Disable VLANs for the given network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vlans_settings
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_vlans_settings,
+  - Paths used are put /networks/{networkId}/appliance/vlans/settings,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -24,47 +24,42 @@
       for the network.
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceVlansSettings
-  description: Complete reference of the updateNetworkApplianceVlansSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vlans-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_vlans_settings,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/vlans/settings,
+  - description: Complete reference of the updateNetworkApplianceVlansSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vlans-settings
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceVlansSettings
+short_description: Resource module for networks _appliance _vlans _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_vlans_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     vlansEnabled: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vlans_settings_info.py b/plugins/modules/networks_appliance_vlans_settings_info.py
index 81dc964de..9246f6266 100644
--- a/plugins/modules/networks_appliance_vlans_settings_info.py
+++ b/plugins/modules/networks_appliance_vlans_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vlans_settings_info
-short_description: Information module for networks _appliance _vlans _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _vlans _settings.
-- Returns the enabled status of VLANs for the network.
-version_added: '2.16.0'
+  - Get all networks _appliance _vlans _settings.
+  - Returns the enabled status of VLANs for the network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vlans_settings_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_vlans_settings,
+  - Paths used are get /networks/{networkId}/appliance/vlans/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceVlansSettings
-  description: Complete reference of the getNetworkApplianceVlansSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlans-settings
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_vlans_settings,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/vlans/settings,
+  - description: Complete reference of the getNetworkApplianceVlansSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vlans-settings
+    name: Cisco Meraki documentation for appliance getNetworkApplianceVlansSettings
+short_description: Information module for networks _appliance _vlans _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _vlans _settings
   cisco.meraki.networks_appliance_vlans_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vpn_bgp.py b/plugins/modules/networks_appliance_vpn_bgp.py
index 833c50819..bb0acb8db 100644
--- a/plugins/modules/networks_appliance_vpn_bgp.py
+++ b/plugins/modules/networks_appliance_vpn_bgp.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vpn_bgp
-short_description: Resource module for networks _appliance _vpn _bgp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _vpn _bgp.
-- Update a Hub BGP Configuration.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _vpn _bgp.
+  - Update a Hub BGP Configuration.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vpn_bgp
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_vpn_bgp,
+  - Paths used are put /networks/{networkId}/appliance/vpn/bgp,
 options:
   asNumber:
     description: An Autonomous System Number (ASN) is required if you are to run BGP
@@ -25,8 +25,8 @@
     type: int
   enabled:
     description: Boolean value to enable or disable the BGP configuration. When BGP
-      is enabled, the asNumber (ASN) will be autopopulated with the preconfigured ASN
-      at other Hubs or a default value if there is no ASN configured.
+      is enabled, the asNumber (ASN) will be autopopulated with the preconfigured
+      ASN at other Hubs or a default value if there is no ASN configured.
     type: bool
   ibgpHoldTimer:
     description: The iBGP holdtimer in seconds. The iBGP holdtimer must be an integer
@@ -40,8 +40,8 @@
     suboptions:
       allowTransit:
         description: When this feature is on, the Meraki device will advertise routes
-          learned from other Autonomous Systems, thereby allowing traffic between Autonomous
-          Systems to transit this AS. When absent, it defaults to false.
+          learned from other Autonomous Systems, thereby allowing traffic between
+          Autonomous Systems to transit this AS. When absent, it defaults to false.
         type: bool
       authentication:
         description: Authentication settings between BGP peers.
@@ -62,33 +62,33 @@
         description: The IPv4 address of the neighbor.
         type: str
       ipv6:
-        description: Information regarding IPv6 address of the neighbor, Required if
-          `ip` is not present.
+        description: Information regarding IPv6 address of the neighbor, Required
+          if `ip` is not present.
         suboptions:
           address:
             description: The IPv6 address of the neighbor.
             type: str
         type: dict
       nextHopIp:
-        description: The IPv4 address of the remote BGP peer that will establish a TCP
-          session with the local MX.
+        description: The IPv4 address of the remote BGP peer that will establish a
+          TCP session with the local MX.
         type: str
       receiveLimit:
-        description: The receive limit is the maximum number of routes that can be received
-          from any BGP peer. The receive limit must be an integer between 0 and 2147483647.
-          When absent, it defaults to 0.
+        description: The receive limit is the maximum number of routes that can be
+          received from any BGP peer. The receive limit must be an integer between
+          0 and 2147483647. When absent, it defaults to 0.
         type: int
       remoteAsNumber:
-        description: Remote ASN of the neighbor. The remote ASN must be an integer between
-          1 and 4294967295.
+        description: Remote ASN of the neighbor. The remote ASN must be an integer
+          between 1 and 4294967295.
         type: int
       sourceInterface:
         description: The output interface for peering with the remote BGP peer. Valid
           values are 'wan1', 'wan2' or 'vlan{VLAN ID}'(e.g. 'vlan123').
         type: str
       ttlSecurity:
-        description: Settings for BGP TTL security to protect BGP peering sessions from
-          forged IP attacks.
+        description: Settings for BGP TTL security to protect BGP peering sessions
+          from forged IP attacks.
         suboptions:
           enabled:
             description: Boolean value to enable or disable BGP TTL security.
@@ -99,64 +99,59 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceVpnBgp
-  description: Complete reference of the updateNetworkApplianceVpnBgp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vpn-bgp
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_vpn_bgp,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/vpn/bgp,
+  - description: Complete reference of the updateNetworkApplianceVpnBgp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vpn-bgp
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceVpnBgp
+short_description: Resource module for networks _appliance _vpn _bgp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_vpn_bgp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     asNumber: 64515
     enabled: true
     ibgpHoldTimer: 120
     neighbors:
-    - allowTransit: true
-      authentication:
-        password: abc123
-      ebgpHoldTimer: 180
-      ebgpMultihop: 2
-      ip: 10.10.10.22
-      ipv6:
-        address: 2002::1234:abcd:ffff:c0a8:101
-      nextHopIp: 1.2.3.4
-      receiveLimit: 120
-      remoteAsNumber: 64343
-      sourceInterface: wan1
-      ttlSecurity:
-        enabled: false
+      - allowTransit: true
+        authentication:
+          password: abc123
+        ebgpHoldTimer: 180
+        ebgpMultihop: 2
+        ip: 10.10.10.22
+        ipv6:
+          address: 2002::1234:abcd:ffff:c0a8:101
+        nextHopIp: 1.2.3.4
+        receiveLimit: 120
+        remoteAsNumber: 64343
+        sourceInterface: wan1
+        ttlSecurity:
+          enabled: false
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vpn_bgp_info.py b/plugins/modules/networks_appliance_vpn_bgp_info.py
index 8827e4d84..fef2e6f36 100644
--- a/plugins/modules/networks_appliance_vpn_bgp_info.py
+++ b/plugins/modules/networks_appliance_vpn_bgp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vpn_bgp_info
-short_description: Information module for networks _appliance _vpn _bgp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _vpn _bgp.
-- Return a Hub BGP Configuration.
-version_added: '2.16.0'
+  - Get all networks _appliance _vpn _bgp.
+  - Return a Hub BGP Configuration.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vpn_bgp_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_vpn_bgp,
+  - Paths used are get /networks/{networkId}/appliance/vpn/bgp,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceVpnBgp
-  description: Complete reference of the getNetworkApplianceVpnBgp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vpn-bgp
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_vpn_bgp,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/vpn/bgp,
+  - description: Complete reference of the getNetworkApplianceVpnBgp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vpn-bgp
+    name: Cisco Meraki documentation for appliance getNetworkApplianceVpnBgp
+short_description: Information module for networks _appliance _vpn _bgp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _vpn _bgp
   cisco.meraki.networks_appliance_vpn_bgp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vpn_site_to_site_vpn.py b/plugins/modules/networks_appliance_vpn_site_to_site_vpn.py
index 2d411dda5..8c389804d 100644
--- a/plugins/modules/networks_appliance_vpn_site_to_site_vpn.py
+++ b/plugins/modules/networks_appliance_vpn_site_to_site_vpn.py
@@ -5,16 +5,18 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vpn_site_to_site_vpn
-short_description: Resource module for networks _appliance _vpn _site _to _site _vpn
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _vpn _site _to _site _vpn.
-- Update the site-to-site VPN settings of a network. Only valid for MX networks in NAT mode.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _vpn _site _to _site
+    _vpn.
+  - Update the site-to-site VPN settings of a network. Only valid for MX networks
+    in NAT mode.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vpn_site_to_site_vpn
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_vpn_site_to_site_vpn,
+  - Paths used are put /networks/{networkId}/appliance/vpn/siteToSiteVpn,
 options:
   hubs:
     description: The list of VPN hubs, in order of preference. In spoke mode, at least
@@ -47,53 +49,49 @@
         type: bool
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceVpnSiteToSiteVpn
-  description: Complete reference of the updateNetworkApplianceVpnSiteToSiteVpn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vpn-site-to-site-vpn
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_vpn_site_to_site_vpn,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/vpn/siteToSiteVpn,
+  - description: Complete reference of the updateNetworkApplianceVpnSiteToSiteVpn
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-vpn-site-to-site-vpn
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceVpnSiteToSiteVpn
+short_description: Resource module for networks _appliance _vpn _site _to _site _vpn
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_vpn_site_to_site_vpn:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     hubs:
-    - hubId: N_4901849
-      useDefaultRoute: true
+      - hubId: N_4901849
+        useDefaultRoute: true
     mode: spoke
     networkId: string
     subnets:
-    - localSubnet: 192.168.1.0/24
-      useVpn: true
-
+      - localSubnet: 192.168.1.0/24
+        useVpn: true
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_vpn_site_to_site_vpn_info.py b/plugins/modules/networks_appliance_vpn_site_to_site_vpn_info.py
index 3360b07b6..dc46a4871 100644
--- a/plugins/modules/networks_appliance_vpn_site_to_site_vpn_info.py
+++ b/plugins/modules/networks_appliance_vpn_site_to_site_vpn_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_vpn_site_to_site_vpn_info
-short_description: Information module for networks _appliance _vpn _site _to _site _vpn
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _vpn _site _to _site _vpn.
-- Return the site-to-site VPN settings of a network. Only valid for MX networks.
-version_added: '2.16.0'
+  - Get all networks _appliance _vpn _site _to _site _vpn.
+  - Return the site-to-site VPN settings of a network. Only valid for MX networks.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_vpn_site_to_site_vpn_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_vpn_site_to_site_vpn,
+  - Paths used are get /networks/{networkId}/appliance/vpn/siteToSiteVpn,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceVpnSiteToSiteVpn
-  description: Complete reference of the getNetworkApplianceVpnSiteToSiteVpn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vpn-site-to-site-vpn
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_vpn_site_to_site_vpn,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/vpn/siteToSiteVpn,
+  - description: Complete reference of the getNetworkApplianceVpnSiteToSiteVpn API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-vpn-site-to-site-vpn
+    name: Cisco Meraki documentation for appliance getNetworkApplianceVpnSiteToSiteVpn
+short_description: Information module for networks _appliance _vpn _site _to _site
+  _vpn
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _vpn _site _to _site _vpn
   cisco.meraki.networks_appliance_vpn_site_to_site_vpn_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_warm_spare.py b/plugins/modules/networks_appliance_warm_spare.py
index e4ed51428..ccbb7df8f 100644
--- a/plugins/modules/networks_appliance_warm_spare.py
+++ b/plugins/modules/networks_appliance_warm_spare.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_warm_spare
-short_description: Resource module for networks _appliance _warm _spare
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _appliance _warm _spare.
-- Update MX warm spare settings.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _appliance _warm _spare.
+  - Update MX warm spare settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_warm_spare
+notes:
+  - SDK Method used are appliance.Appliance.update_network_appliance_warm_spare,
+  - Paths used are put /networks/{networkId}/appliance/warmSpare,
 options:
   enabled:
     description: Enable warm spare.
@@ -35,43 +35,39 @@
     description: The WAN 2 shared IP.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateNetworkApplianceWarmSpare
-  description: Complete reference of the updateNetworkApplianceWarmSpare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-warm-spare
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_network_appliance_warm_spare,
-
-  - Paths used are
-    put /networks/{networkId}/appliance/warmSpare,
+  - description: Complete reference of the updateNetworkApplianceWarmSpare API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-warm-spare
+    name: Cisco Meraki documentation for appliance updateNetworkApplianceWarmSpare
+short_description: Resource module for networks _appliance _warm _spare
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_appliance_warm_spare:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     networkId: string
@@ -79,7 +75,6 @@
     uplinkMode: virtual
     virtualIp1: 1.2.3.4
     virtualIp2: 1.2.3.4
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_warm_spare_info.py b/plugins/modules/networks_appliance_warm_spare_info.py
index 30c08058d..45f4c4846 100644
--- a/plugins/modules/networks_appliance_warm_spare_info.py
+++ b/plugins/modules/networks_appliance_warm_spare_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_warm_spare_info
-short_description: Information module for networks _appliance _warm _spare
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _appliance _warm _spare.
-- Return MX warm spare settings.
-version_added: '2.16.0'
+  - Get all networks _appliance _warm _spare.
+  - Return MX warm spare settings.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_warm_spare_info
+notes:
+  - SDK Method used are appliance.Appliance.get_network_appliance_warm_spare,
+  - Paths used are get /networks/{networkId}/appliance/warmSpare,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getNetworkApplianceWarmSpare
-  description: Complete reference of the getNetworkApplianceWarmSpare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-warm-spare
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_network_appliance_warm_spare,
-
-  - Paths used are
-    get /networks/{networkId}/appliance/warmSpare,
+  - description: Complete reference of the getNetworkApplianceWarmSpare API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-warm-spare
+    name: Cisco Meraki documentation for appliance getNetworkApplianceWarmSpare
+short_description: Information module for networks _appliance _warm _spare
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _appliance _warm _spare
   cisco.meraki.networks_appliance_warm_spare_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_appliance_warm_spare_swap.py b/plugins/modules/networks_appliance_warm_spare_swap.py
index dc2d34325..8873a526b 100644
--- a/plugins/modules/networks_appliance_warm_spare_swap.py
+++ b/plugins/modules/networks_appliance_warm_spare_swap.py
@@ -5,60 +5,55 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_appliance_warm_spare_swap
-short_description: Resource module for networks _appliance _warm _spare _swap
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _appliance _warm _spare _swap.
-- Swap MX primary and warm spare appliances.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _appliance _warm _spare _swap.
+  - Swap MX primary and warm spare appliances.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_appliance_warm_spare_swap
+notes:
+  - SDK Method used are appliance.Appliance.swap_network_appliance_warm_spare,
+  - Paths used are post /networks/{networkId}/appliance/warmSpare/swap,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance swapNetworkApplianceWarmSpare
-  description: Complete reference of the swapNetworkApplianceWarmSpare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!swap-network-appliance-warm-spare
-notes:
-  - SDK Method used are
-    appliance.Appliance.swap_network_appliance_warm_spare,
-
-  - Paths used are
-    post /networks/{networkId}/appliance/warmSpare/swap,
+  - description: Complete reference of the swapNetworkApplianceWarmSpare API.
+    link: https://developer.cisco.com/meraki/api-v1/#!swap-network-appliance-warm-spare
+    name: Cisco Meraki documentation for appliance swapNetworkApplianceWarmSpare
+short_description: Resource module for networks _appliance _warm _spare _swap
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_appliance_warm_spare_swap:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_bind.py b/plugins/modules/networks_bind.py
index 9a5de7451..e6bb76194 100644
--- a/plugins/modules/networks_bind.py
+++ b/plugins/modules/networks_bind.py
@@ -5,23 +5,23 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_bind
-short_description: Resource module for networks _bind
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _bind.
-- Bind a network to a template.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _bind.
+  - Bind a network to a template.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_bind
+notes:
+  - SDK Method used are networks.Networks.bind_network,
+  - Paths used are post /networks/{networkId}/bind,
 options:
   autoBind:
-    description: Optional boolean indicating whether the network's switches should automatically
-      bind to profiles of the same model. Defaults to false if left unspecified. This
-      option only affects switch networks and switch templates. Auto-bind is not valid
-      unless the switch template has at least one profile and has at most one profile
-      per switch model.
+    description: Optional boolean indicating whether the network's switches should
+      automatically bind to profiles of the same model. Defaults to false if left
+      unspecified. This option only affects switch networks and switch templates.
+      Auto-bind is not valid unless the switch template has at least one profile and
+      has at most one profile per switch model.
     type: bool
   configTemplateId:
     description: The ID of the template to which the network should be bound.
@@ -30,47 +30,42 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks bindNetwork
-  description: Complete reference of the bindNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!bind-network
-notes:
-  - SDK Method used are
-    networks.Networks.bind_network,
-
-  - Paths used are
-    post /networks/{networkId}/bind,
+  - description: Complete reference of the bindNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!bind-network
+    name: Cisco Meraki documentation for networks bindNetwork
+short_description: Resource module for networks _bind
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_bind:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     autoBind: false
     configTemplateId: N_23952905
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_bluetooth_clients_info.py b/plugins/modules/networks_bluetooth_clients_info.py
index bf33fe34a..01188736e 100644
--- a/plugins/modules/networks_bluetooth_clients_info.py
+++ b/plugins/modules/networks_bluetooth_clients_info.py
@@ -5,82 +5,80 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_bluetooth_clients_info
-short_description: Information module for networks _bluetooth _clients
+author: Francisco Munoz (@fmunoz)
 description:
-- Get networks _bluetooth _clients by id.
-- Return a Bluetooth client. Bluetooth clients can be identified by their ID or their MAC.
-version_added: '2.16.0'
+  - Get networks _bluetooth _clients by id.
+  - Return a Bluetooth client. Bluetooth clients can be identified by their ID or
+    their MAC.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_bluetooth_clients_info
+notes:
+  - SDK Method used are networks.Networks.get_network_bluetooth_client,
+  - Paths used are get /networks/{networkId}/bluetoothClients/{bluetoothClientId},
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
   bluetoothClientId:
     description:
-    - BluetoothClientId path parameter. Bluetooth client ID.
+      - BluetoothClientId path parameter. Bluetooth client ID.
     type: str
+  connectivityHistoryTimespan:
+    description:
+      - 'ConnectivityHistoryTimespan query parameter. The timespan, in seconds, for
+        the connectivityHistory data. By default 1 day, 86400, will be used.
+
+        '
+    type: int
+  headers:
+    description: Additional headers.
+    type: dict
   includeConnectivityHistory:
     description:
-    - IncludeConnectivityHistory query parameter. Include the connectivity history for this client.
+      - IncludeConnectivityHistory query parameter. Include the connectivity history
+        for this client.
     type: bool
-  connectivityHistoryTimespan:
+  networkId:
     description:
-    - >
-      ConnectivityHistoryTimespan query parameter. The timespan, in seconds, for the connectivityHistory data. By
-      default 1 day, 86400, will be used.
-    type: int
+      - NetworkId path parameter. Network ID.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkBluetoothClient
-  description: Complete reference of the getNetworkBluetoothClient API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-bluetooth-client
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_bluetooth_client,
-
-  - Paths used are
-    get /networks/{networkId}/bluetoothClients/{bluetoothClientId},
+  - description: Complete reference of the getNetworkBluetoothClient API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-bluetooth-client
+    name: Cisco Meraki documentation for networks getNetworkBluetoothClient
+short_description: Information module for networks _bluetooth _clients
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get networks _bluetooth _clients by id
   cisco.meraki.networks_bluetooth_clients_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-    includeConnectivityHistory: True
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
+    includeConnectivityHistory: true
     connectivityHistoryTimespan: 0
     networkId: string
     bluetoothClientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_camera_quality_retention_profiles.py b/plugins/modules/networks_camera_quality_retention_profiles.py
index cbc12d84f..c01f6532f 100644
--- a/plugins/modules/networks_camera_quality_retention_profiles.py
+++ b/plugins/modules/networks_camera_quality_retention_profiles.py
@@ -5,36 +5,40 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_camera_quality_retention_profiles
-short_description: Resource module for networks _camera _quality _retention _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _camera _quality _retention _profiles.
-- Creates new quality retention profile for this network.
-- Delete an existing quality retention profile for this network.
-- Update an existing quality retention profile for this network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _camera _quality
+    _retention _profiles.
+  - Creates new quality retention profile for this network.
+  - Delete an existing quality retention profile for this network.
+  - Update an existing quality retention profile for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_camera_quality_retention_profiles
+notes:
+  - SDK Method used are camera.Camera.create_network_camera_quality_retention_profile,
+    camera.Camera.delete_network_camera_quality_retention_profile, camera.Camera.update_network_camera_quality_retention_profile,
+  - Paths used are post /networks/{networkId}/camera/qualityRetentionProfiles, delete
+    /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
+    put /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
 options:
   audioRecordingEnabled:
     description: Whether or not to record audio. Can be either true or false. Defaults
       to false.
     type: bool
   cloudArchiveEnabled:
-    description: Create redundant video backup using Cloud Archive. Can be either true
-      or false. Defaults to false.
+    description: Create redundant video backup using Cloud Archive. Can be either
+      true or false. Defaults to false.
     type: bool
   maxRetentionDays:
-    description: The maximum number of days for which the data will be stored, or 'null'
-      to keep data until storage space runs out. If the former, it can be in the range
-      of one to ninety days.
+    description: The maximum number of days for which the data will be stored, or
+      'null' to keep data until storage space runs out. If the former, it can be in
+      the range of one to ninety days.
     type: int
   motionBasedRetentionEnabled:
     description: Deletes footage older than 3 days in which no motion was detected.
-      Can be either true or false. Defaults to false. This setting does not apply to
-      MV2 cameras.
+      Can be either true or false. Defaults to false. This setting does not apply
+      to MV2 cameras.
     type: bool
   motionDetectorVersion:
     description: The version of the motion detector that will be used by the camera.
@@ -51,9 +55,9 @@
       ID.
     type: str
   restrictedBandwidthModeEnabled:
-    description: Disable features that require additional bandwidth such as Motion Recap.
-      Can be either true or false. Defaults to false. This setting does not apply to
-      MV2 cameras.
+    description: Disable features that require additional bandwidth such as Motion
+      Recap. Can be either true or false. Defaults to false. This setting does not
+      apply to MV2 cameras.
     type: bool
   scheduleId:
     description: Schedule for which this camera will record video, or 'null' to always
@@ -332,105 +336,98 @@
         type: dict
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera createNetworkCameraQualityRetentionProfile
-  description: Complete reference of the createNetworkCameraQualityRetentionProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-camera-quality-retention-profile
-- name: Cisco Meraki documentation for camera deleteNetworkCameraQualityRetentionProfile
-  description: Complete reference of the deleteNetworkCameraQualityRetentionProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-camera-quality-retention-profile
-- name: Cisco Meraki documentation for camera updateNetworkCameraQualityRetentionProfile
-  description: Complete reference of the updateNetworkCameraQualityRetentionProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-camera-quality-retention-profile
-notes:
-  - SDK Method used are
-    camera.Camera.create_network_camera_quality_retention_profile,
-    camera.Camera.delete_network_camera_quality_retention_profile,
-    camera.Camera.update_network_camera_quality_retention_profile,
-
-  - Paths used are
-    post /networks/{networkId}/camera/qualityRetentionProfiles,
-    delete /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
-    put /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
+  - description: Complete reference of the createNetworkCameraQualityRetentionProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-camera-quality-retention-profile
+    name: Cisco Meraki documentation for camera createNetworkCameraQualityRetentionProfile
+  - description: Complete reference of the deleteNetworkCameraQualityRetentionProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-camera-quality-retention-profile
+    name: Cisco Meraki documentation for camera deleteNetworkCameraQualityRetentionProfile
+  - description: Complete reference of the updateNetworkCameraQualityRetentionProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-camera-quality-retention-profile
+    name: Cisco Meraki documentation for camera updateNetworkCameraQualityRetentionProfile
+short_description: Resource module for networks _camera _quality _retention _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_camera_quality_retention_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Sample quality retention profile
     networkId: string
-
 - name: Delete by id
   cisco.meraki.networks_camera_quality_retention_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     qualityRetentionProfileId: string
-
 - name: Update by id
   cisco.meraki.networks_camera_quality_retention_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     audioRecordingEnabled: true
     cloudArchiveEnabled: true
@@ -511,7 +508,6 @@
       MV93X:
         quality: string
         resolution: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_camera_quality_retention_profiles_info.py b/plugins/modules/networks_camera_quality_retention_profiles_info.py
index 1d3855378..a1e1bd910 100644
--- a/plugins/modules/networks_camera_quality_retention_profiles_info.py
+++ b/plugins/modules/networks_camera_quality_retention_profiles_info.py
@@ -5,102 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_camera_quality_retention_profiles_info
-short_description: Information module for networks _camera _quality _retention _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _camera _quality _retention _profiles.
-- Get networks _camera _quality _retention _profiles by id.
-- List the quality retention profiles for this network.
-- Retrieve a single quality retention profile.
-version_added: '2.16.0'
+  - Get all networks _camera _quality _retention _profiles.
+  - Get networks _camera _quality _retention _profiles by id.
+  - List the quality retention profiles for this network.
+  - Retrieve a single quality retention profile.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_camera_quality_retention_profiles_info
+notes:
+  - SDK Method used are camera.Camera.get_network_camera_quality_retention_profile,
+    camera.Camera.get_network_camera_quality_retention_profiles,
+  - Paths used are get /networks/{networkId}/camera/qualityRetentionProfiles, get
+    /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   qualityRetentionProfileId:
     description:
-    - QualityRetentionProfileId path parameter. Quality retention profile ID.
+      - QualityRetentionProfileId path parameter. Quality retention profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getNetworkCameraQualityRetentionProfile
-  description: Complete reference of the getNetworkCameraQualityRetentionProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-quality-retention-profile
-- name: Cisco Meraki documentation for camera getNetworkCameraQualityRetentionProfiles
-  description: Complete reference of the getNetworkCameraQualityRetentionProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-quality-retention-profiles
-notes:
-  - SDK Method used are
-    camera.Camera.get_network_camera_quality_retention_profile,
-    camera.Camera.get_network_camera_quality_retention_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/camera/qualityRetentionProfiles,
-    get /networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId},
+  - description: Complete reference of the getNetworkCameraQualityRetentionProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-quality-retention-profile
+    name: Cisco Meraki documentation for camera getNetworkCameraQualityRetentionProfile
+  - description: Complete reference of the getNetworkCameraQualityRetentionProfiles
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-quality-retention-profiles
+    name: Cisco Meraki documentation for camera getNetworkCameraQualityRetentionProfiles
+short_description: Information module for networks _camera _quality _retention _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _camera _quality _retention _profiles
   cisco.meraki.networks_camera_quality_retention_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _camera _quality _retention _profiles by id
   cisco.meraki.networks_camera_quality_retention_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     qualityRetentionProfileId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_camera_wireless_profiles.py b/plugins/modules/networks_camera_wireless_profiles.py
index 9169832f6..74be6713f 100644
--- a/plugins/modules/networks_camera_wireless_profiles.py
+++ b/plugins/modules/networks_camera_wireless_profiles.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_camera_wireless_profiles
-short_description: Resource module for networks _camera _wireless _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _camera _wireless _profiles.
-- Creates a new camera wireless profile for this network.
-- Delete an existing camera wireless profile for this network.
-- Update an existing camera wireless profile in this network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _camera _wireless
+    _profiles.
+  - Creates a new camera wireless profile for this network.
+  - Delete an existing camera wireless profile for this network.
+  - Update an existing camera wireless profile in this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_camera_wireless_profiles
+notes:
+  - SDK Method used are camera.Camera.create_network_camera_wireless_profile, camera.Camera.delete_network_camera_wireless_profile,
+    camera.Camera.update_network_camera_wireless_profile,
+  - Paths used are post /networks/{networkId}/camera/wirelessProfiles, delete /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
+    put /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
 options:
   identity:
     description: The identity of the wireless profile. Required for creating wireless
@@ -57,53 +60,45 @@
     description: WirelessProfileId path parameter. Wireless profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera createNetworkCameraWirelessProfile
-  description: Complete reference of the createNetworkCameraWirelessProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-camera-wireless-profile
-- name: Cisco Meraki documentation for camera deleteNetworkCameraWirelessProfile
-  description: Complete reference of the deleteNetworkCameraWirelessProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-camera-wireless-profile
-- name: Cisco Meraki documentation for camera updateNetworkCameraWirelessProfile
-  description: Complete reference of the updateNetworkCameraWirelessProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-camera-wireless-profile
-notes:
-  - SDK Method used are
-    camera.Camera.create_network_camera_wireless_profile,
-    camera.Camera.delete_network_camera_wireless_profile,
-    camera.Camera.update_network_camera_wireless_profile,
-
-  - Paths used are
-    post /networks/{networkId}/camera/wirelessProfiles,
-    delete /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
-    put /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
+  - description: Complete reference of the createNetworkCameraWirelessProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-camera-wireless-profile
+    name: Cisco Meraki documentation for camera createNetworkCameraWirelessProfile
+  - description: Complete reference of the deleteNetworkCameraWirelessProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-camera-wireless-profile
+    name: Cisco Meraki documentation for camera deleteNetworkCameraWirelessProfile
+  - description: Complete reference of the updateNetworkCameraWirelessProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-camera-wireless-profile
+    name: Cisco Meraki documentation for camera updateNetworkCameraWirelessProfile
+short_description: Resource module for networks _camera _wireless _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_camera_wireless_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     identity:
       password: password123
@@ -115,55 +110,53 @@
       encryptionMode: wpa-eap
       name: ssid test
       psk: sampleKey
-
 - name: Delete by id
   cisco.meraki.networks_camera_wireless_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     wirelessProfileId: string
-
 - name: Update by id
   cisco.meraki.networks_camera_wireless_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     identity:
       password: password123
@@ -176,7 +169,6 @@
       name: ssid test
       psk: sampleKey
     wirelessProfileId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_camera_wireless_profiles_info.py b/plugins/modules/networks_camera_wireless_profiles_info.py
index ad0c5e135..87fc319a9 100644
--- a/plugins/modules/networks_camera_wireless_profiles_info.py
+++ b/plugins/modules/networks_camera_wireless_profiles_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_camera_wireless_profiles_info
-short_description: Information module for networks _camera _wireless _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _camera _wireless _profiles.
-- Get networks _camera _wireless _profiles by id.
-- List the camera wireless profiles for this network.
-- Retrieve a single camera wireless profile.
-version_added: '2.16.0'
+  - Get all networks _camera _wireless _profiles.
+  - Get networks _camera _wireless _profiles by id.
+  - List the camera wireless profiles for this network.
+  - Retrieve a single camera wireless profile.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_camera_wireless_profiles_info
+notes:
+  - SDK Method used are camera.Camera.get_network_camera_wireless_profile, camera.Camera.get_network_camera_wireless_profiles,
+  - Paths used are get /networks/{networkId}/camera/wirelessProfiles, get /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   wirelessProfileId:
     description:
-    - WirelessProfileId path parameter. Wireless profile ID.
+      - WirelessProfileId path parameter. Wireless profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getNetworkCameraWirelessProfile
-  description: Complete reference of the getNetworkCameraWirelessProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-wireless-profile
-- name: Cisco Meraki documentation for camera getNetworkCameraWirelessProfiles
-  description: Complete reference of the getNetworkCameraWirelessProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-wireless-profiles
-notes:
-  - SDK Method used are
-    camera.Camera.get_network_camera_wireless_profile,
-    camera.Camera.get_network_camera_wireless_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/camera/wirelessProfiles,
-    get /networks/{networkId}/camera/wirelessProfiles/{wirelessProfileId},
+  - description: Complete reference of the getNetworkCameraWirelessProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-wireless-profile
+    name: Cisco Meraki documentation for camera getNetworkCameraWirelessProfile
+  - description: Complete reference of the getNetworkCameraWirelessProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-camera-wireless-profiles
+    name: Cisco Meraki documentation for camera getNetworkCameraWirelessProfiles
+short_description: Information module for networks _camera _wireless _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _camera _wireless _profiles
   cisco.meraki.networks_camera_wireless_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _camera _wireless _profiles by id
   cisco.meraki.networks_camera_wireless_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     wirelessProfileId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cancel.py b/plugins/modules/networks_cancel.py
index c1b23743d..a2432c2f5 100644
--- a/plugins/modules/networks_cancel.py
+++ b/plugins/modules/networks_cancel.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cancel
-short_description: Resource module for networks _cancel
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _cancel.
-- Cancel a scheduled or running auto locate job.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _cancel.
+  - Cancel a scheduled or running auto locate job.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_cancel
+notes:
+  - SDK Method used are networks.Networks.cancel_network_floor_plans_auto_locate_job,
+  - Paths used are post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/cancel,
 options:
   jobId:
     description: JobId path parameter. Job ID.
@@ -23,46 +23,41 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks cancelNetworkFloorPlansAutoLocateJob
-  description: Complete reference of the cancelNetworkFloorPlansAutoLocateJob API.
-  link: https://developer.cisco.com/meraki/api-v1/#!cancel-network-floor-plans-auto-locate-job
-notes:
-  - SDK Method used are
-    networks.Networks.cancel_network_floor_plans_auto_locate_job,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/cancel,
+  - description: Complete reference of the cancelNetworkFloorPlansAutoLocateJob API.
+    link: https://developer.cisco.com/meraki/api-v1/#!cancel-network-floor-plans-auto-locate-job
+    name: Cisco Meraki documentation for networks cancelNetworkFloorPlansAutoLocateJob
+short_description: Resource module for networks _cancel
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_cancel:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     jobId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations.py b/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations.py
index b5a345a79..c4c96c3d7 100644
--- a/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations.py
+++ b/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_connectivity_monitoring_destinations
-short_description: Resource module for networks _cellular _gateway _connectivity _monitoring _destinations
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _cellular _gateway _connectivity _monitoring _destinations.
-- Update the connectivity testing destinations for an MG network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _cellular _gateway _connectivity
+    _monitoring _destinations.
+  - Update the connectivity testing destinations for an MG network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_connectivity_monitoring_destinations
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_network_cellular_gateway_connectivity_monitoring_destinations,
+  - Paths used are put /networks/{networkId}/cellularGateway/connectivityMonitoringDestinations,
 options:
   destinations:
     description: The list of connectivity monitoring destinations.
@@ -25,8 +26,8 @@
           (true) or not (false). Defaults to false. Only one default is allowed.
         type: bool
       description:
-        description: Description of the testing destination. Optional, defaults to an
-          empty string.
+        description: Description of the testing destination. Optional, defaults to
+          an empty string.
         type: str
       ip:
         description: The IP address to test connectivity with.
@@ -36,50 +37,47 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayConnectivityMonitoringDestinations
-  description: Complete reference of the updateNetworkCellularGatewayConnectivityMonitoringDestinations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-connectivity-monitoring-destinations
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_network_cellular_gateway_connectivity_monitoring_destinations,
-
-  - Paths used are
-    put /networks/{networkId}/cellularGateway/connectivityMonitoringDestinations,
+  - description: Complete reference of the updateNetworkCellularGatewayConnectivityMonitoringDestinations
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-connectivity-monitoring-destinations
+    name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayConnectivityMonitoringDestinations
+short_description: Resource module for networks _cellular _gateway _connectivity _monitoring
+  _destinations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_cellular_gateway_connectivity_monitoring_destinations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     destinations:
-    - default: false
-      description: Google
-      ip: 1.2.3.4
+      - default: false
+        description: Google
+        ip: 1.2.3.4
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations_info.py b/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations_info.py
index 4250aaa7d..4f298b4e7 100644
--- a/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations_info.py
+++ b/plugins/modules/networks_cellular_gateway_connectivity_monitoring_destinations_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_connectivity_monitoring_destinations_info
-short_description: Information module for networks _cellular _gateway _connectivity _monitoring _destinations
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _cellular _gateway _connectivity _monitoring _destinations.
-- Return the connectivity testing destinations for an MG network.
-version_added: '2.16.0'
+  - Get all networks _cellular _gateway _connectivity _monitoring _destinations.
+  - Return the connectivity testing destinations for an MG network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_connectivity_monitoring_destinations_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_network_cellular_gateway_connectivity_monitoring_destinations,
+  - Paths used are get /networks/{networkId}/cellularGateway/connectivityMonitoringDestinations,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayConnectivityMonitoringDestinations
-  description: Complete reference of the getNetworkCellularGatewayConnectivityMonitoringDestinations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-connectivity-monitoring-destinations
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_network_cellular_gateway_connectivity_monitoring_destinations,
-
-  - Paths used are
-    get /networks/{networkId}/cellularGateway/connectivityMonitoringDestinations,
+  - description: Complete reference of the getNetworkCellularGatewayConnectivityMonitoringDestinations
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-connectivity-monitoring-destinations
+    name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayConnectivityMonitoringDestinations
+short_description: Information module for networks _cellular _gateway _connectivity
+  _monitoring _destinations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _cellular _gateway _connectivity _monitoring _destinations
   cisco.meraki.networks_cellular_gateway_connectivity_monitoring_destinations_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_dhcp.py b/plugins/modules/networks_cellular_gateway_dhcp.py
index e470cc8cb..2c71ec779 100644
--- a/plugins/modules/networks_cellular_gateway_dhcp.py
+++ b/plugins/modules/networks_cellular_gateway_dhcp.py
@@ -5,79 +5,74 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_dhcp
-short_description: Resource module for networks _cellular _gateway _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _cellular _gateway _dhcp.
-- Update common DHCP settings of MGs.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _cellular _gateway _dhcp.
+  - Update common DHCP settings of MGs.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_dhcp
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_network_cellular_gateway_dhcp,
+  - Paths used are put /networks/{networkId}/cellularGateway/dhcp,
 options:
   dhcpLeaseTime:
     description: DHCP Lease time for all MG of the network. Possible values are '30
       minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1 week'.
     type: str
   dnsCustomNameservers:
-    description: List of fixed IPs representing the the DNS Name servers when the mode
-      is 'custom'.
+    description: List of fixed IPs representing the the DNS Name servers when the
+      mode is 'custom'.
     elements: str
     type: list
   dnsNameservers:
-    description: DNS name servers mode for all MG of the network. Possible values are
-      'upstream_dns', 'google_dns', 'opendns', 'custom'.
+    description: DNS name servers mode for all MG of the network. Possible values
+      are 'upstream_dns', 'google_dns', 'opendns', 'custom'.
     type: str
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayDhcp
-  description: Complete reference of the updateNetworkCellularGatewayDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-dhcp
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_network_cellular_gateway_dhcp,
-
-  - Paths used are
-    put /networks/{networkId}/cellularGateway/dhcp,
+  - description: Complete reference of the updateNetworkCellularGatewayDhcp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-dhcp
+    name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayDhcp
+short_description: Resource module for networks _cellular _gateway _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_cellular_gateway_dhcp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     dhcpLeaseTime: 1 hour
     dnsCustomNameservers:
-    - 172.16.2.111
-    - 172.16.2.30
+      - 172.16.2.111
+      - 172.16.2.30
     dnsNameservers: custom
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_dhcp_info.py b/plugins/modules/networks_cellular_gateway_dhcp_info.py
index 75877917b..c55c13e94 100644
--- a/plugins/modules/networks_cellular_gateway_dhcp_info.py
+++ b/plugins/modules/networks_cellular_gateway_dhcp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_dhcp_info
-short_description: Information module for networks _cellular _gateway _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _cellular _gateway _dhcp.
-- List common DHCP settings of MGs.
-version_added: '2.16.0'
+  - Get all networks _cellular _gateway _dhcp.
+  - List common DHCP settings of MGs.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_dhcp_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_network_cellular_gateway_dhcp,
+  - Paths used are get /networks/{networkId}/cellularGateway/dhcp,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayDhcp
-  description: Complete reference of the getNetworkCellularGatewayDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-dhcp
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_network_cellular_gateway_dhcp,
-
-  - Paths used are
-    get /networks/{networkId}/cellularGateway/dhcp,
+  - description: Complete reference of the getNetworkCellularGatewayDhcp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-dhcp
+    name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayDhcp
+short_description: Information module for networks _cellular _gateway _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _cellular _gateway _dhcp
   cisco.meraki.networks_cellular_gateway_dhcp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_subnet_pool.py b/plugins/modules/networks_cellular_gateway_subnet_pool.py
index 914140452..9d6ff4c9c 100644
--- a/plugins/modules/networks_cellular_gateway_subnet_pool.py
+++ b/plugins/modules/networks_cellular_gateway_subnet_pool.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_subnet_pool
-short_description: Resource module for networks _cellular _gateway _subnet _pool
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _cellular _gateway _subnet _pool.
-- Update the subnet pool and mask configuration for MGs in the network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _cellular _gateway _subnet _pool.
+  - Update the subnet pool and mask configuration for MGs in the network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_subnet_pool
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_network_cellular_gateway_subnet_pool,
+  - Paths used are put /networks/{networkId}/cellularGateway/subnetPool,
 options:
   cidr:
     description: CIDR of the pool of subnets. Each MG in this network will automatically
@@ -27,48 +27,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewaySubnetPool
-  description: Complete reference of the updateNetworkCellularGatewaySubnetPool API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-subnet-pool
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_network_cellular_gateway_subnet_pool,
-
-  - Paths used are
-    put /networks/{networkId}/cellularGateway/subnetPool,
+  - description: Complete reference of the updateNetworkCellularGatewaySubnetPool
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-subnet-pool
+    name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewaySubnetPool
+short_description: Resource module for networks _cellular _gateway _subnet _pool
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_cellular_gateway_subnet_pool:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     cidr: 192.168.0.0/16
     mask: 24
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_subnet_pool_info.py b/plugins/modules/networks_cellular_gateway_subnet_pool_info.py
index f7e558b99..b5734c26a 100644
--- a/plugins/modules/networks_cellular_gateway_subnet_pool_info.py
+++ b/plugins/modules/networks_cellular_gateway_subnet_pool_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_subnet_pool_info
-short_description: Information module for networks _cellular _gateway _subnet _pool
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _cellular _gateway _subnet _pool.
-- Return the subnet pool and mask configured for MGs in the network.
-version_added: '2.16.0'
+  - Get all networks _cellular _gateway _subnet _pool.
+  - Return the subnet pool and mask configured for MGs in the network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_subnet_pool_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_network_cellular_gateway_subnet_pool,
+  - Paths used are get /networks/{networkId}/cellularGateway/subnetPool,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewaySubnetPool
-  description: Complete reference of the getNetworkCellularGatewaySubnetPool API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-subnet-pool
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_network_cellular_gateway_subnet_pool,
-
-  - Paths used are
-    get /networks/{networkId}/cellularGateway/subnetPool,
+  - description: Complete reference of the getNetworkCellularGatewaySubnetPool API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-subnet-pool
+    name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewaySubnetPool
+short_description: Information module for networks _cellular _gateway _subnet _pool
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _cellular _gateway _subnet _pool
   cisco.meraki.networks_cellular_gateway_subnet_pool_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_uplink.py b/plugins/modules/networks_cellular_gateway_uplink.py
index 5317b3c94..90fd96b80 100644
--- a/plugins/modules/networks_cellular_gateway_uplink.py
+++ b/plugins/modules/networks_cellular_gateway_uplink.py
@@ -5,23 +5,23 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_uplink
-short_description: Resource module for networks _cellular _gateway _uplink
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _cellular _gateway _uplink.
-- Updates the uplink settings for your MG network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _cellular _gateway _uplink.
+  - Updates the uplink settings for your MG network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_uplink
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.update_network_cellular_gateway_uplink,
+  - Paths used are put /networks/{networkId}/cellularGateway/uplink,
 options:
   bandwidthLimits:
     description: The bandwidth settings for the 'cellular' uplink.
     suboptions:
       limitDown:
-        description: The maximum download limit (integer, in Kbps). Null indicates no
-          limit.
+        description: The maximum download limit (integer, in Kbps). Null indicates
+          no limit.
         type: int
       limitUp:
         description: The maximum upload limit (integer, in Kbps). Null indicates no
@@ -32,49 +32,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayUplink
-  description: Complete reference of the updateNetworkCellularGatewayUplink API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-uplink
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.update_network_cellular_gateway_uplink,
-
-  - Paths used are
-    put /networks/{networkId}/cellularGateway/uplink,
+  - description: Complete reference of the updateNetworkCellularGatewayUplink API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-cellular-gateway-uplink
+    name: Cisco Meraki documentation for cellularGateway updateNetworkCellularGatewayUplink
+short_description: Resource module for networks _cellular _gateway _uplink
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_cellular_gateway_uplink:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bandwidthLimits:
       limitDown: 1000000
       limitUp: 1000000
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_cellular_gateway_uplink_info.py b/plugins/modules/networks_cellular_gateway_uplink_info.py
index ad819b635..10e50ed0d 100644
--- a/plugins/modules/networks_cellular_gateway_uplink_info.py
+++ b/plugins/modules/networks_cellular_gateway_uplink_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_cellular_gateway_uplink_info
-short_description: Information module for networks _cellular _gateway _uplink
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _cellular _gateway _uplink.
-- Returns the uplink settings for your MG network.
-version_added: '2.16.0'
+  - Get all networks _cellular _gateway _uplink.
+  - Returns the uplink settings for your MG network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_cellular_gateway_uplink_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_network_cellular_gateway_uplink,
+  - Paths used are get /networks/{networkId}/cellularGateway/uplink,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayUplink
-  description: Complete reference of the getNetworkCellularGatewayUplink API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-uplink
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_network_cellular_gateway_uplink,
-
-  - Paths used are
-    get /networks/{networkId}/cellularGateway/uplink,
+  - description: Complete reference of the getNetworkCellularGatewayUplink API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-cellular-gateway-uplink
+    name: Cisco Meraki documentation for cellularGateway getNetworkCellularGatewayUplink
+short_description: Information module for networks _cellular _gateway _uplink
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _cellular _gateway _uplink
   cisco.meraki.networks_cellular_gateway_uplink_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_info.py b/plugins/modules/networks_clients_info.py
index 1be979066..9ae19bd14 100644
--- a/plugins/modules/networks_clients_info.py
+++ b/plugins/modules/networks_clients_info.py
@@ -5,153 +5,170 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_info
-short_description: Information module for networks _clients
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _clients.
-- Get networks _clients by id.
-- List the clients that have used this network in the timespan. The data is updated at most once every five minutes.
-- >
-   Return the client associated with the given identifier. Clients can be identified by a client key or either the
-   MAC or IP depending on whether the network uses Track-by-IP.
-version_added: '2.16.0'
+  - Get all networks _clients.
+  - Get networks _clients by id.
+  - List the clients that have used this network in the timespan. The data is updated
+    at most once every five minutes.
+  - 'Return the client associated with the given identifier. Clients can be identified
+    by a client key or either the MAC or IP depending on whether the network uses
+    Track-by-IP.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_info
+notes:
+  - SDK Method used are networks.Networks.get_network_client, networks.Networks.get_network_clients,
+  - Paths used are get /networks/{networkId}/clients, get /networks/{networkId}/clients/{clientId},
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
+  clientId:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - ClientId path parameter. Client ID.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
-    type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 5000. Default is 10.
-    type: int
-  startingAfter:
+  description:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - Description query parameter. Filters clients based on a partial or full match
+        for the description field.
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  statuses:
-    description:
-    - Statuses query parameter. Filters clients based on status. Can be one of 'Online' or 'Offline'.
-    elements: str
-    type: list
+  headers:
+    description: Additional headers.
+    type: dict
   ip:
     description:
-    - Ip query parameter. Filters clients based on a partial or full match for the ip address field.
+      - Ip query parameter. Filters clients based on a partial or full match for the
+        ip address field.
     type: str
   ip6:
     description:
-    - Ip6 query parameter. Filters clients based on a partial or full match for the ip6 address field.
+      - Ip6 query parameter. Filters clients based on a partial or full match for
+        the ip6 address field.
     type: str
   ip6Local:
     description:
-    - Ip6Local query parameter. Filters clients based on a partial or full match for the ip6Local address field.
+      - Ip6Local query parameter. Filters clients based on a partial or full match
+        for the ip6Local address field.
     type: str
   mac:
     description:
-    - Mac query parameter. Filters clients based on a partial or full match for the mac address field.
+      - Mac query parameter. Filters clients based on a partial or full match for
+        the mac address field.
     type: str
-  os:
+  namedVlan:
     description:
-    - Os query parameter. Filters clients based on a partial or full match for the os (operating system) field.
+      - NamedVlan query parameter. Filters clients based on the partial or full match
+        for the named VLAN field.
     type: str
-  pskGroup:
+  networkId:
     description:
-    - PskGroup query parameter. Filters clients based on partial or full match for the iPSK name field.
+      - NetworkId path parameter. Network ID.
     type: str
-  description:
+  os:
     description:
-    - Description query parameter. Filters clients based on a partial or full match for the description field.
+      - Os query parameter. Filters clients based on a partial or full match for the
+        os (operating system) field.
     type: str
-  vlan:
+  perPage:
     description:
-    - Vlan query parameter. Filters clients based on the full match for the VLAN field.
-    type: str
-  namedVlan:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 5000. Default is 10.
+    type: int
+  pskGroup:
     description:
-    - NamedVlan query parameter. Filters clients based on the partial or full match for the named VLAN field.
+      - PskGroup query parameter. Filters clients based on partial or full match for
+        the iPSK name field.
     type: str
   recentDeviceConnections:
     description:
-    - >
-      RecentDeviceConnections query parameter. Filters clients based on recent connection type. Can be one of
-      'Wired' or 'Wireless'.
+      - 'RecentDeviceConnections query parameter. Filters clients based on recent
+        connection type. Can be one of ''Wired'' or ''Wireless''.
+
+        '
     elements: str
     type: list
-  clientId:
+  startingAfter:
     description:
-    - ClientId path parameter. Client ID.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  statuses:
+    description:
+      - Statuses query parameter. Filters clients based on status. Can be one of 'Online'
+        or 'Offline'.
+    elements: str
+    type: list
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
+    type: float
+  vlan:
+    description:
+      - Vlan query parameter. Filters clients based on the full match for the VLAN
+        field.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkClient
-  description: Complete reference of the getNetworkClient API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-client
-- name: Cisco Meraki documentation for networks getNetworkClients
-  description: Complete reference of the getNetworkClients API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-clients
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_client,
-    networks.Networks.get_network_clients,
-
-  - Paths used are
-    get /networks/{networkId}/clients,
-    get /networks/{networkId}/clients/{clientId},
+  - description: Complete reference of the getNetworkClient API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-client
+    name: Cisco Meraki documentation for networks getNetworkClient
+  - description: Complete reference of the getNetworkClients API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-clients
+    name: Cisco Meraki documentation for networks getNetworkClients
+short_description: Information module for networks _clients
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _clients
   cisco.meraki.networks_clients_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     timespan: 0
     perPage: 0
@@ -172,33 +189,31 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get networks _clients by id
   cisco.meraki.networks_clients_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     clientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_overview_info.py b/plugins/modules/networks_clients_overview_info.py
index df042de24..b5fac7ea3 100644
--- a/plugins/modules/networks_clients_overview_info.py
+++ b/plugins/modules/networks_clients_overview_info.py
@@ -5,90 +5,90 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_overview_info
-short_description: Information module for networks _clients _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _clients _overview.
-- Return overview statistics for network clients.
-version_added: '2.16.0'
+  - Get all networks _clients _overview.
+  - Return overview statistics for network clients.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_overview_info
+notes:
+  - SDK Method used are networks.Networks.get_network_clients_overview,
+  - Paths used are get /networks/{networkId}/clients/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
+  resolution:
+    description:
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 7200, 86400, 604800, 2592000. The default is 604800.
+
+        '
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 1 day.
+
+        '
     type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are
-      7200, 86400, 604800, 2592000. The default is 604800.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkClientsOverview
-  description: Complete reference of the getNetworkClientsOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-clients-overview
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_clients_overview,
-
-  - Paths used are
-    get /networks/{networkId}/clients/overview,
+  - description: Complete reference of the getNetworkClientsOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-clients-overview
+    name: Cisco Meraki documentation for networks getNetworkClientsOverview
+short_description: Information module for networks _clients _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _clients _overview
   cisco.meraki.networks_clients_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_policy.py b/plugins/modules/networks_clients_policy.py
index a597962a3..647c35df7 100644
--- a/plugins/modules/networks_clients_policy.py
+++ b/plugins/modules/networks_clients_policy.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_policy
-short_description: Resource module for networks _clients _policy
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _clients _policy.
-- >
-   Update the policy assigned to a client on the network. Clients can be identified by a client key or either the MAC
-   or IP depending on whether the network uses Track-by-IP.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _clients _policy.
+  - 'Update the policy assigned to a client on the network. Clients can be identified
+    by a client key or either the MAC or IP depending on whether the network uses
+    Track-by-IP.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_policy
+notes:
+  - SDK Method used are networks.Networks.update_network_client_policy,
+  - Paths used are put /networks/{networkId}/clients/{clientId}/policy,
 options:
   clientId:
     description: ClientId path parameter. Client ID.
@@ -26,56 +28,51 @@
       'Group policy'. Required.
     type: str
   groupPolicyId:
-    description: Optional If 'devicePolicy' is set to 'Group policy' this param is used
-      to specify the group policy ID.
+    description: Optional If 'devicePolicy' is set to 'Group policy' this param is
+      used to specify the group policy ID.
     type: str
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkClientPolicy
-  description: Complete reference of the updateNetworkClientPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-client-policy
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_client_policy,
-
-  - Paths used are
-    put /networks/{networkId}/clients/{clientId}/policy,
+  - description: Complete reference of the updateNetworkClientPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-client-policy
+    name: Cisco Meraki documentation for networks updateNetworkClientPolicy
+short_description: Resource module for networks _clients _policy
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_clients_policy:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     clientId: string
     devicePolicy: Group policy
     groupPolicyId: '101'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_policy_info.py b/plugins/modules/networks_clients_policy_info.py
index 180956b7f..48bca01bb 100644
--- a/plugins/modules/networks_clients_policy_info.py
+++ b/plugins/modules/networks_clients_policy_info.py
@@ -5,72 +5,69 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_policy_info
-short_description: Information module for networks _clients _policy
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _clients _policy.
-- >
-   Return the policy assigned to a client on the network. Clients can be identified by a client key or either the MAC
-   or IP depending on whether the network uses Track-by-IP.
-version_added: '2.16.0'
+  - Get all networks _clients _policy.
+  - 'Return the policy assigned to a client on the network. Clients can be identified
+    by a client key or either the MAC or IP depending on whether the network uses
+    Track-by-IP.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_policy_info
+notes:
+  - SDK Method used are networks.Networks.get_network_client_policy,
+  - Paths used are get /networks/{networkId}/clients/{clientId}/policy,
 options:
+  clientId:
+    description:
+      - ClientId path parameter. Client ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  clientId:
-    description:
-    - ClientId path parameter. Client ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkClientPolicy
-  description: Complete reference of the getNetworkClientPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-client-policy
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_client_policy,
-
-  - Paths used are
-    get /networks/{networkId}/clients/{clientId}/policy,
+  - description: Complete reference of the getNetworkClientPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-client-policy
+    name: Cisco Meraki documentation for networks getNetworkClientPolicy
+short_description: Information module for networks _clients _policy
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _clients _policy
   cisco.meraki.networks_clients_policy_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     clientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_provision.py b/plugins/modules/networks_clients_provision.py
index 399015fb8..dccf151a3 100644
--- a/plugins/modules/networks_clients_provision.py
+++ b/plugins/modules/networks_clients_provision.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_provision
-short_description: Resource module for networks _clients _provision
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _clients _provision.
-- Provisions a client with a name and policy. Clients can be provisioned before they associate to the network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _clients _provision.
+  - Provisions a client with a name and policy. Clients can be provisioned before
+    they associate to the network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_provision
+notes:
+  - SDK Method used are networks.Networks.provision_network_clients,
+  - Paths used are post /networks/{networkId}/clients/provision,
 options:
   clients:
     description: The array of clients to provision.
@@ -40,8 +41,8 @@
     type: str
   policiesBySecurityAppliance:
     description: An object, describing what the policy-connection association is for
-      the security appliance. (Only relevant if the security appliance is actually within
-      the network).
+      the security appliance. (Only relevant if the security appliance is actually
+      within the network).
     suboptions:
       devicePolicy:
         description: The policy to apply to the specified client. Can be 'Allowed',
@@ -49,9 +50,9 @@
         type: str
     type: dict
   policiesBySsid:
-    description: An object, describing the policy-connection associations for each active
-      SSID within the network. Keys should be the number of enabled SSIDs, mapping to
-      an object describing the client's policy.
+    description: An object, describing the policy-connection associations for each
+      active SSID within the network. Keys should be the number of enabled SSIDs,
+      mapping to an object describing the client's policy.
     suboptions:
       '0':
         description: The number for the SSID.
@@ -62,8 +63,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '1':
@@ -75,8 +76,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '10':
@@ -88,8 +89,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '11':
@@ -101,8 +102,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '12':
@@ -114,8 +115,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '13':
@@ -127,8 +128,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '14':
@@ -140,8 +141,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '2':
@@ -153,8 +154,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '3':
@@ -166,8 +167,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '4':
@@ -179,8 +180,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '5':
@@ -192,8 +193,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '6':
@@ -205,8 +206,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '7':
@@ -218,8 +219,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '8':
@@ -231,8 +232,8 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
       '9':
@@ -244,52 +245,48 @@
             type: str
           groupPolicyId:
             description: The ID of the desired group policy to apply to the client.
-              Required if 'devicePolicy' is set to "Group policy". Otherwise this is
-              ignored.
+              Required if 'devicePolicy' is set to "Group policy". Otherwise this
+              is ignored.
             type: str
         type: dict
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks provisionNetworkClients
-  description: Complete reference of the provisionNetworkClients API.
-  link: https://developer.cisco.com/meraki/api-v1/#!provision-network-clients
-notes:
-  - SDK Method used are
-    networks.Networks.provision_network_clients,
-
-  - Paths used are
-    post /networks/{networkId}/clients/provision,
+  - description: Complete reference of the provisionNetworkClients API.
+    link: https://developer.cisco.com/meraki/api-v1/#!provision-network-clients
+    name: Cisco Meraki documentation for networks provisionNetworkClients
+short_description: Resource module for networks _clients _provision
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_clients_provision:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     clients:
-    - mac: 00:11:22:33:44:55
-      name: Miles's phone
+      - mac: 00:11:22:33:44:55
+        name: Miles's phone
     devicePolicy: Group policy
     groupPolicyId: '101'
     networkId: string
@@ -341,7 +338,6 @@
       '9':
         devicePolicy: Group policy
         groupPolicyId: '101'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_splash_authorization_status.py b/plugins/modules/networks_clients_splash_authorization_status.py
index 43832ae1d..022e3423d 100644
--- a/plugins/modules/networks_clients_splash_authorization_status.py
+++ b/plugins/modules/networks_clients_splash_authorization_status.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_splash_authorization_status
-short_description: Resource module for networks _clients _splash _authorization _status
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _clients _splash _authorization _status.
-- >
-   Update a client's splash authorization. Clients can be identified by a client key or either the MAC or IP
-   depending on whether the network uses Track-by-IP.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _clients _splash _authorization
+    _status.
+  - 'Update a client''s splash authorization. Clients can be identified by a client
+    key or either the MAC or IP depending on whether the network uses Track-by-IP.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_splash_authorization_status
+notes:
+  - SDK Method used are networks.Networks.update_network_client_splash_authorization_status,
+  - Paths used are put /networks/{networkId}/clients/{clientId}/splashAuthorizationStatus,
 options:
   clientId:
     description: ClientId path parameter. Client ID.
@@ -27,8 +29,8 @@
   ssids:
     description: The target SSIDs. Each SSID must be enabled and must have Click-through
       splash enabled. For each SSID where isAuthorized is true, the expiration time
-      will automatically be set according to the SSID's splash frequency. Not all networks
-      support configuring all SSIDs.
+      will automatically be set according to the SSID's splash frequency. Not all
+      networks support configuring all SSIDs.
     suboptions:
       '0':
         description: Splash authorization for SSID 0.
@@ -137,43 +139,40 @@
         type: dict
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkClientSplashAuthorizationStatus
-  description: Complete reference of the updateNetworkClientSplashAuthorizationStatus API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-client-splash-authorization-status
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_client_splash_authorization_status,
-
-  - Paths used are
-    put /networks/{networkId}/clients/{clientId}/splashAuthorizationStatus,
+  - description: Complete reference of the updateNetworkClientSplashAuthorizationStatus
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-client-splash-authorization-status
+    name: Cisco Meraki documentation for networks updateNetworkClientSplashAuthorizationStatus
+short_description: Resource module for networks _clients _splash _authorization _status
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_clients_splash_authorization_status:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     clientId: string
     networkId: string
@@ -182,7 +181,6 @@
         isAuthorized: true
       '2':
         isAuthorized: false
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_clients_splash_authorization_status_info.py b/plugins/modules/networks_clients_splash_authorization_status_info.py
index b715f487d..fd18c9b62 100644
--- a/plugins/modules/networks_clients_splash_authorization_status_info.py
+++ b/plugins/modules/networks_clients_splash_authorization_status_info.py
@@ -5,73 +5,72 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_clients_splash_authorization_status_info
-short_description: Information module for networks _clients _splash _authorization _status
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _clients _splash _authorization _status.
-- >
-   Return the splash authorization for a client, for each SSID they've associated with through splash. Only enabled
-   SSIDs with Click-through splash enabled will be included. Clients can be identified by a client key or either the
-   MAC or IP depending on whether the network uses Track-by-IP.
-version_added: '2.16.0'
+  - Get all networks _clients _splash _authorization _status.
+  - 'Return the splash authorization for a client, for each SSID they''ve associated
+    with through splash. Only enabled SSIDs with Click-through splash enabled will
+    be included. Clients can be identified by a client key or either the MAC or IP
+    depending on whether the network uses Track-by-IP.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_clients_splash_authorization_status_info
+notes:
+  - SDK Method used are networks.Networks.get_network_client_splash_authorization_status,
+  - Paths used are get /networks/{networkId}/clients/{clientId}/splashAuthorizationStatus,
 options:
+  clientId:
+    description:
+      - ClientId path parameter. Client ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  clientId:
-    description:
-    - ClientId path parameter. Client ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkClientSplashAuthorizationStatus
-  description: Complete reference of the getNetworkClientSplashAuthorizationStatus API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-client-splash-authorization-status
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_client_splash_authorization_status,
-
-  - Paths used are
-    get /networks/{networkId}/clients/{clientId}/splashAuthorizationStatus,
+  - description: Complete reference of the getNetworkClientSplashAuthorizationStatus
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-client-splash-authorization-status
+    name: Cisco Meraki documentation for networks getNetworkClientSplashAuthorizationStatus
+short_description: Information module for networks _clients _splash _authorization
+  _status
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _clients _splash _authorization _status
   cisco.meraki.networks_clients_splash_authorization_status_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     clientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_devices_claim.py b/plugins/modules/networks_devices_claim.py
index 66d981ff1..ab161df8e 100644
--- a/plugins/modules/networks_devices_claim.py
+++ b/plugins/modules/networks_devices_claim.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_devices_claim
-short_description: Resource module for networks _devices _claim
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _devices _claim.
-- >
-   Claim devices into a network. Note for recently claimed devices, it may take a few minutes for API requests
-   against that device to succeed. This operation can be used up to ten times within a single five minute window.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _devices _claim.
+  - 'Claim devices into a network. Note for recently claimed devices, it may take
+    a few minutes for API requests against that device to succeed. This operation
+    can be used up to ten times within a single five minute window.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_devices_claim
+notes:
+  - SDK Method used are networks.Networks.claim_network_devices,
+  - Paths used are post /networks/{networkId}/devices/claim,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -26,50 +28,45 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks claimNetworkDevices
-  description: Complete reference of the claimNetworkDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!claim-network-devices
-notes:
-  - SDK Method used are
-    networks.Networks.claim_network_devices,
-
-  - Paths used are
-    post /networks/{networkId}/devices/claim,
+  - description: Complete reference of the claimNetworkDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!claim-network-devices
+    name: Cisco Meraki documentation for networks claimNetworkDevices
+short_description: Resource module for networks _devices _claim
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_devices_claim:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     addAtomically: true
     networkId: string
     serials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_devices_claim_vmx.py b/plugins/modules/networks_devices_claim_vmx.py
index 369be1c2a..35ee98b47 100644
--- a/plugins/modules/networks_devices_claim_vmx.py
+++ b/plugins/modules/networks_devices_claim_vmx.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_devices_claim_vmx
-short_description: Resource module for networks _devices _claim _vmx
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _devices _claim _vmx.
-- Claim a vMX into a network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _devices _claim _vmx.
+  - Claim a vMX into a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_devices_claim_vmx
+notes:
+  - SDK Method used are networks.Networks.vmx_network_devices_claim,
+  - Paths used are post /networks/{networkId}/devices/claim/vmx,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -24,46 +24,41 @@
       xlarge, 100.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks vmxNetworkDevicesClaim
-  description: Complete reference of the vmxNetworkDevicesClaim API.
-  link: https://developer.cisco.com/meraki/api-v1/#!vmx-network-devices-claim
-notes:
-  - SDK Method used are
-    networks.Networks.vmx_network_devices_claim,
-
-  - Paths used are
-    post /networks/{networkId}/devices/claim/vmx,
+  - description: Complete reference of the vmxNetworkDevicesClaim API.
+    link: https://developer.cisco.com/meraki/api-v1/#!vmx-network-devices-claim
+    name: Cisco Meraki documentation for networks vmxNetworkDevicesClaim
+short_description: Resource module for networks _devices _claim _vmx
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_devices_claim_vmx:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     size: small
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_devices_remove.py b/plugins/modules/networks_devices_remove.py
index 059766557..7ea84b64b 100644
--- a/plugins/modules/networks_devices_remove.py
+++ b/plugins/modules/networks_devices_remove.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_devices_remove
-short_description: Resource module for networks _devices _remove
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _devices _remove.
-- Remove a single device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _devices _remove.
+  - Remove a single device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_devices_remove
+notes:
+  - SDK Method used are networks.Networks.remove_network_devices,
+  - Paths used are post /networks/{networkId}/devices/remove,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +23,41 @@
     description: The serial of a device.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks removeNetworkDevices
-  description: Complete reference of the removeNetworkDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!remove-network-devices
-notes:
-  - SDK Method used are
-    networks.Networks.remove_network_devices,
-
-  - Paths used are
-    post /networks/{networkId}/devices/remove,
+  - description: Complete reference of the removeNetworkDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!remove-network-devices
+    name: Cisco Meraki documentation for networks removeNetworkDevices
+short_description: Resource module for networks _devices _remove
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_devices_remove:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     serial: Q234-ABCD-5678
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_events_event_types_info.py b/plugins/modules/networks_events_event_types_info.py
index eebfc3e42..bfcaa37b9 100644
--- a/plugins/modules/networks_events_event_types_info.py
+++ b/plugins/modules/networks_events_event_types_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_events_event_types_info
-short_description: Information module for networks _events _event _types
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _events _event _types.
-- List the event type to human-readable description.
-version_added: '2.16.0'
+  - Get all networks _events _event _types.
+  - List the event type to human-readable description.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_events_event_types_info
+notes:
+  - SDK Method used are networks.Networks.get_network_events_event_types,
+  - Paths used are get /networks/{networkId}/events/eventTypes,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkEventsEventTypes
-  description: Complete reference of the getNetworkEventsEventTypes API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-events-event-types
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_events_event_types,
-
-  - Paths used are
-    get /networks/{networkId}/events/eventTypes,
+  - description: Complete reference of the getNetworkEventsEventTypes API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-events-event-types
+    name: Cisco Meraki documentation for networks getNetworkEventsEventTypes
+short_description: Information module for networks _events _event _types
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _events _event _types
   cisco.meraki.networks_events_event_types_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_events_info.py b/plugins/modules/networks_events_info.py
index 8c8093400..d3b4130f2 100644
--- a/plugins/modules/networks_events_info.py
+++ b/plugins/modules/networks_events_info.py
@@ -5,162 +5,181 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_events_info
-short_description: Information module for networks _events
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _events.
-- List the events for the network.
-version_added: '2.16.0'
+  - Get all networks _events.
+  - List the events for the network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_events_info
+notes:
+  - SDK Method used are networks.Networks.get_network_events,
+  - Paths used are get /networks/{networkId}/events,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
+  clientIp:
     description:
-    - NetworkId path parameter. Network ID.
+      - 'ClientIp query parameter. The IP of the client which the list of events will
+        be filtered with. Only supported for track-by-IP networks.
+
+        '
     type: str
-  productType:
+  clientMac:
     description:
-    - >
-      ProductType query parameter. The product type to fetch events for. This parameter is required for networks
-      with multiple device types. Valid types are wireless, appliance, switch, systemsManager, camera,
-      cellularGateway, wirelessController, and secureConnect.
+      - 'ClientMac query parameter. The MAC address of the client which the list of
+        events will be filtered with. Only supported for track-by-MAC networks.
+
+        '
     type: str
-  includedEventTypes:
-    description:
-    - >
-      IncludedEventTypes query parameter. A list of event types. The returned events will be filtered to only
-      include events with these types.
-    elements: str
-    type: list
-  excludedEventTypes:
-    description:
-    - >
-      ExcludedEventTypes query parameter. A list of event types. The returned events will be filtered to exclude
-      events with these types.
-    elements: str
-    type: list
-  deviceMac:
+  clientName:
     description:
-    - DeviceMac query parameter. The MAC address of the Meraki device which the list of events will be filtered with.
+      - 'ClientName query parameter. The name, or partial name, of the client which
+        the list of events will be filtered with.
+
+        '
     type: str
-  deviceSerial:
+  deviceMac:
     description:
-    - DeviceSerial query parameter. The serial of the Meraki device which the list of events will be filtered with.
+      - DeviceMac query parameter. The MAC address of the Meraki device which the
+        list of events will be filtered with.
     type: str
   deviceName:
     description:
-    - DeviceName query parameter. The name of the Meraki device which the list of events will be filtered with.
-    type: str
-  clientIp:
-    description:
-    - >
-      ClientIp query parameter. The IP of the client which the list of events will be filtered with. Only
-      supported for track-by-IP networks.
-    type: str
-  clientMac:
-    description:
-    - >
-      ClientMac query parameter. The MAC address of the client which the list of events will be filtered with.
-      Only supported for track-by-MAC networks.
-    type: str
-  clientName:
-    description:
-    - >
-      ClientName query parameter. The name, or partial name, of the client which the list of events will be
-      filtered with.
+      - DeviceName query parameter. The name of the Meraki device which the list of
+        events will be filtered with.
     type: str
-  smDeviceMac:
+  deviceSerial:
     description:
-    - >
-      SmDeviceMac query parameter. The MAC address of the Systems Manager device which the list of events will be
-      filtered with.
+      - DeviceSerial query parameter. The serial of the Meraki device which the list
+        of events will be filtered with.
     type: str
-  smDeviceName:
+  endingBefore:
     description:
-    - >
-      SmDeviceName query parameter. The name of the Systems Manager device which the list of events will be
-      filtered with.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   eventDetails:
     description:
-    - >
-      EventDetails query parameter. The details of the event(Catalyst device only) which the list of events will
-      be filtered with.
+      - 'EventDetails query parameter. The details of the event(Catalyst device only)
+        which the list of events will be filtered with.
+
+        '
     type: str
   eventSeverity:
     description:
-    - >
-      EventSeverity query parameter. The severity of the event(Catalyst device only) which the list of events will
-      be filtered with.
+      - 'EventSeverity query parameter. The severity of the event(Catalyst device
+        only) which the list of events will be filtered with.
+
+        '
     type: str
+  excludedEventTypes:
+    description:
+      - 'ExcludedEventTypes query parameter. A list of event types. The returned events
+        will be filtered to exclude events with these types.
+
+        '
+    elements: str
+    type: list
+  headers:
+    description: Additional headers.
+    type: dict
+  includedEventTypes:
+    description:
+      - 'IncludedEventTypes query parameter. A list of event types. The returned events
+        will be filtered to only include events with these types.
+
+        '
+    elements: str
+    type: list
   isCatalyst:
     description:
-    - >
-      IsCatalyst query parameter. Boolean indicating that whether it is a Catalyst device. For Catalyst device,
-      eventDetails and eventSeverity can be used to filter events.
+      - 'IsCatalyst query parameter. Boolean indicating that whether it is a Catalyst
+        device. For Catalyst device, eventDetails and eventSeverity can be used to
+        filter events.
+
+        '
     type: bool
+  networkId:
+    description:
+      - NetworkId path parameter. Network ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 10.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 10.
     type: int
-  startingAfter:
+  productType:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ProductType query parameter. The product type to fetch events for. This parameter
+        is required for networks with multiple device types. Valid types are wireless,
+        appliance, switch, systemsManager, camera, cellularGateway, wirelessController,
+        and secureConnect.
+
+        '
     type: str
-  endingBefore:
+  smDeviceMac:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'SmDeviceMac query parameter. The MAC address of the Systems Manager device
+        which the list of events will be filtered with.
+
+        '
+    type: str
+  smDeviceName:
+    description:
+      - 'SmDeviceName query parameter. The name of the Systems Manager device which
+        the list of events will be filtered with.
+
+        '
+    type: str
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkEvents
-  description: Complete reference of the getNetworkEvents API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-events
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_events,
-
-  - Paths used are
-    get /networks/{networkId}/events,
+  - description: Complete reference of the getNetworkEvents API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-events
+    name: Cisco Meraki documentation for networks getNetworkEvents
+short_description: Information module for networks _events
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _events
   cisco.meraki.networks_events_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     productType: string
     includedEventTypes: []
     excludedEventTypes: []
@@ -174,7 +193,7 @@
     smDeviceName: string
     eventDetails: string
     eventSeverity: string
-    isCatalyst: True
+    isCatalyst: true
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -182,7 +201,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades.py b/plugins/modules/networks_firmware_upgrades.py
index 6dceba044..c69086f6f 100644
--- a/plugins/modules/networks_firmware_upgrades.py
+++ b/plugins/modules/networks_firmware_upgrades.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades
-short_description: Resource module for networks _firmware _upgrades
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _firmware _upgrades.
-- Update firmware upgrade information for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _firmware _upgrades.
+  - Update firmware upgrade information for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades
+notes:
+  - SDK Method used are networks.Networks.update_network_firmware_upgrades,
+  - Paths used are put /networks/{networkId}/firmwareUpgrades,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -226,43 +226,39 @@
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgrades
-  description: Complete reference of the updateNetworkFirmwareUpgrades API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_firmware_upgrades,
-
-  - Paths used are
-    put /networks/{networkId}/firmwareUpgrades,
+  - description: Complete reference of the updateNetworkFirmwareUpgrades API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades
+    name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgrades
+short_description: Resource module for networks _firmware _upgrades
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_firmware_upgrades:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     products:
@@ -324,7 +320,6 @@
     upgradeWindow:
       dayOfWeek: sun
       hourOfDay: '4:00'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_info.py b/plugins/modules/networks_firmware_upgrades_info.py
index 0456b3551..4b71f2798 100644
--- a/plugins/modules/networks_firmware_upgrades_info.py
+++ b/plugins/modules/networks_firmware_upgrades_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_info
-short_description: Information module for networks _firmware _upgrades
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _firmware _upgrades.
-- Get firmware upgrade information for a network.
-version_added: '2.16.0'
+  - Get all networks _firmware _upgrades.
+  - Get firmware upgrade information for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_info
+notes:
+  - SDK Method used are networks.Networks.get_network_firmware_upgrades,
+  - Paths used are get /networks/{networkId}/firmwareUpgrades,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkFirmwareUpgrades
-  description: Complete reference of the getNetworkFirmwareUpgrades API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_firmware_upgrades,
-
-  - Paths used are
-    get /networks/{networkId}/firmwareUpgrades,
+  - description: Complete reference of the getNetworkFirmwareUpgrades API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades
+    name: Cisco Meraki documentation for networks getNetworkFirmwareUpgrades
+short_description: Information module for networks _firmware _upgrades
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _firmware _upgrades
   cisco.meraki.networks_firmware_upgrades_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_rollbacks.py b/plugins/modules/networks_firmware_upgrades_rollbacks.py
index fd012fa55..1570d70de 100644
--- a/plugins/modules/networks_firmware_upgrades_rollbacks.py
+++ b/plugins/modules/networks_firmware_upgrades_rollbacks.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_rollbacks
-short_description: Resource module for networks _firmware _upgrades _rollbacks
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _firmware _upgrades _rollbacks.
-- Rollback a Firmware Upgrade For A Network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _firmware _upgrades _rollbacks.
+  - Rollback a Firmware Upgrade For A Network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_rollbacks
+notes:
+  - SDK Method used are networks.Networks.create_network_firmware_upgrades_rollback,
+  - Paths used are post /networks/{networkId}/firmwareUpgrades/rollbacks,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -44,52 +44,47 @@
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesRollback
-  description: Complete reference of the createNetworkFirmwareUpgradesRollback API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-rollback
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_firmware_upgrades_rollback,
-
-  - Paths used are
-    post /networks/{networkId}/firmwareUpgrades/rollbacks,
+  - description: Complete reference of the createNetworkFirmwareUpgradesRollback API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-rollback
+    name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesRollback
+short_description: Resource module for networks _firmware _upgrades _rollbacks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_firmware_upgrades_rollbacks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     product: switch
     reasons:
-    - category: performance
-      comment: Network was slower with the upgrade
+      - category: performance
+        comment: Network was slower with the upgrade
     time: '2020-10-21T02:00:00Z'
     toVersion:
       id: '7857'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_events.py b/plugins/modules/networks_firmware_upgrades_staged_events.py
index bb07d774e..3f8ebcede 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_events.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_events.py
@@ -5,17 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_events
-short_description: Resource module for networks _firmware _upgrades _staged _events
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create and update of the resource networks _firmware _upgrades _staged _events.
-- Create a Staged Upgrade Event for a network.
-- Update the Staged Upgrade Event for a network.
-version_added: '2.16.0'
+  - Manage operations create and update of the resource networks _firmware _upgrades
+    _staged _events.
+  - Create a Staged Upgrade Event for a network.
+  - Update the Staged Upgrade Event for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_events
+notes:
+  - SDK Method used are networks.Networks.create_network_firmware_upgrades_staged_event,
+    networks.Networks.update_network_firmware_upgrades_staged_events,
+  - Paths used are post /networks/{networkId}/firmwareUpgrades/staged/events, put
+    /networks/{networkId}/firmwareUpgrades/staged/events,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -69,54 +72,50 @@
         description: The Staged Upgrade Milestones for the specific stage.
         suboptions:
           scheduledFor:
-            description: The start time of the staged upgrade stage. (In ISO-8601 format,
-              in the time zone of the network.).
+            description: The start time of the staged upgrade stage. (In ISO-8601
+              format, in the time zone of the network.).
             type: str
         type: dict
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesStagedEvent
-  description: Complete reference of the createNetworkFirmwareUpgradesStagedEvent API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-staged-event
-- name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedEvents
-  description: Complete reference of the updateNetworkFirmwareUpgradesStagedEvents API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-events
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_firmware_upgrades_staged_event,
-    networks.Networks.update_network_firmware_upgrades_staged_events,
-
-  - Paths used are
-    post /networks/{networkId}/firmwareUpgrades/staged/events,
-    put /networks/{networkId}/firmwareUpgrades/staged/events,
+  - description: Complete reference of the createNetworkFirmwareUpgradesStagedEvent
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-staged-event
+    name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesStagedEvent
+  - description: Complete reference of the updateNetworkFirmwareUpgradesStagedEvents
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-events
+    name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedEvents
+short_description: Resource module for networks _firmware _upgrades _staged _events
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_firmware_upgrades_staged_events:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     products:
@@ -129,41 +128,39 @@
           toVersion:
             id: '4321'
     stages:
-    - group:
-        id: '1234'
-      milestones:
-        scheduledFor: '2018-02-11T00:00:00Z'
-
+      - group:
+          id: '1234'
+        milestones:
+          scheduledFor: '2018-02-11T00:00:00Z'
 - name: Update all
   cisco.meraki.networks_firmware_upgrades_staged_events:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     stages:
-    - group:
-        id: '1234'
-      milestones:
-        scheduledFor: '2018-02-11T00:00:00Z'
-
+      - group:
+          id: '1234'
+        milestones:
+          scheduledFor: '2018-02-11T00:00:00Z'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_events_defer.py b/plugins/modules/networks_firmware_upgrades_staged_events_defer.py
index ee83d09ad..918357a6f 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_events_defer.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_events_defer.py
@@ -5,60 +5,58 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_events_defer
-short_description: Resource module for networks _firmware _upgrades _staged _events _defer
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _firmware _upgrades _staged _events _defer.
-- Postpone by 1 week all pending staged upgrade stages for a network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _firmware _upgrades _staged _events
+    _defer.
+  - Postpone by 1 week all pending staged upgrade stages for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_events_defer
+notes:
+  - SDK Method used are networks.Networks.defer_network_firmware_upgrades_staged_events,
+  - Paths used are post /networks/{networkId}/firmwareUpgrades/staged/events/defer,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks deferNetworkFirmwareUpgradesStagedEvents
-  description: Complete reference of the deferNetworkFirmwareUpgradesStagedEvents API.
-  link: https://developer.cisco.com/meraki/api-v1/#!defer-network-firmware-upgrades-staged-events
-notes:
-  - SDK Method used are
-    networks.Networks.defer_network_firmware_upgrades_staged_events,
-
-  - Paths used are
-    post /networks/{networkId}/firmwareUpgrades/staged/events/defer,
+  - description: Complete reference of the deferNetworkFirmwareUpgradesStagedEvents
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!defer-network-firmware-upgrades-staged-events
+    name: Cisco Meraki documentation for networks deferNetworkFirmwareUpgradesStagedEvents
+short_description: Resource module for networks _firmware _upgrades _staged _events
+  _defer
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_firmware_upgrades_staged_events_defer:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_events_info.py b/plugins/modules/networks_firmware_upgrades_staged_events_info.py
index 927c7758a..020b47c3a 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_events_info.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_events_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_events_info
-short_description: Information module for networks _firmware _upgrades _staged _events
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _firmware _upgrades _staged _events.
-- Get the Staged Upgrade Event from a network.
-version_added: '2.16.0'
+  - Get all networks _firmware _upgrades _staged _events.
+  - Get the Staged Upgrade Event from a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_events_info
+notes:
+  - SDK Method used are networks.Networks.get_network_firmware_upgrades_staged_events,
+  - Paths used are get /networks/{networkId}/firmwareUpgrades/staged/events,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedEvents
-  description: Complete reference of the getNetworkFirmwareUpgradesStagedEvents API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-events
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_firmware_upgrades_staged_events,
-
-  - Paths used are
-    get /networks/{networkId}/firmwareUpgrades/staged/events,
+  - description: Complete reference of the getNetworkFirmwareUpgradesStagedEvents
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-events
+    name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedEvents
+short_description: Information module for networks _firmware _upgrades _staged _events
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _firmware _upgrades _staged _events
   cisco.meraki.networks_firmware_upgrades_staged_events_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_events_rollbacks.py b/plugins/modules/networks_firmware_upgrades_staged_events_rollbacks.py
index 49c65104d..0b413e4a0 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_events_rollbacks.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_events_rollbacks.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_events_rollbacks
-short_description: Resource module for networks _firmware _upgrades _staged _events _rollbacks
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _firmware _upgrades _staged _events _rollbacks.
-- Rollback a Staged Upgrade Event for a network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _firmware _upgrades _staged _events
+    _rollbacks.
+  - Rollback a Staged Upgrade Event for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_events_rollbacks
+notes:
+  - SDK Method used are networks.Networks.rollbacks_network_firmware_upgrades_staged_events,
+  - Paths used are post /networks/{networkId}/firmwareUpgrades/staged/events/rollbacks,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -31,8 +32,8 @@
         type: str
     type: list
   stages:
-    description: All completed or in-progress stages in the network with their new start
-      times. All pending stages will be canceled.
+    description: All completed or in-progress stages in the network with their new
+      start times. All pending stages will be canceled.
     elements: dict
     suboptions:
       group:
@@ -46,59 +47,56 @@
         description: The Staged Upgrade Milestones for the specific stage.
         suboptions:
           scheduledFor:
-            description: The start time of the staged upgrade stage. (In ISO-8601 format,
-              in the time zone of the network.).
+            description: The start time of the staged upgrade stage. (In ISO-8601
+              format, in the time zone of the network.).
             type: str
         type: dict
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks rollbacksNetworkFirmwareUpgradesStagedEvents
-  description: Complete reference of the rollbacksNetworkFirmwareUpgradesStagedEvents API.
-  link: https://developer.cisco.com/meraki/api-v1/#!rollbacks-network-firmware-upgrades-staged-events
-notes:
-  - SDK Method used are
-    networks.Networks.rollbacks_network_firmware_upgrades_staged_events,
-
-  - Paths used are
-    post /networks/{networkId}/firmwareUpgrades/staged/events/rollbacks,
+  - description: Complete reference of the rollbacksNetworkFirmwareUpgradesStagedEvents
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!rollbacks-network-firmware-upgrades-staged-events
+    name: Cisco Meraki documentation for networks rollbacksNetworkFirmwareUpgradesStagedEvents
+short_description: Resource module for networks _firmware _upgrades _staged _events
+  _rollbacks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_firmware_upgrades_staged_events_rollbacks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     reasons:
-    - category: performance
-      comment: Network was slower with the upgrade
+      - category: performance
+        comment: Network was slower with the upgrade
     stages:
-    - group:
-        id: '1234'
-      milestones:
-        scheduledFor: '2018-02-11T00:00:00Z'
-
+      - group:
+          id: '1234'
+        milestones:
+          scheduledFor: '2018-02-11T00:00:00Z'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_groups.py b/plugins/modules/networks_firmware_upgrades_staged_groups.py
index 730671123..ef343db9c 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_groups.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_groups.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_groups
-short_description: Resource module for networks _firmware _upgrades _staged _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _firmware _upgrades _staged _groups.
-- Create a Staged Upgrade Group for a network.
-- Delete a Staged Upgrade Group.
-- Update a Staged Upgrade Group for a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _firmware
+    _upgrades _staged _groups.
+  - Create a Staged Upgrade Group for a network.
+  - Delete a Staged Upgrade Group.
+  - Update a Staged Upgrade Group for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_groups
+notes:
+  - SDK Method used are networks.Networks.create_network_firmware_upgrades_staged_group,
+    networks.Networks.delete_network_firmware_upgrades_staged_group, networks.Networks.update_network_firmware_upgrades_staged_group,
+  - Paths used are post /networks/{networkId}/firmwareUpgrades/staged/groups, delete
+    /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId}, put /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId},
 options:
   assignedDevices:
     description: The devices and Switch Stacks assigned to the Group.
@@ -45,7 +48,8 @@
         type: list
     type: dict
   description:
-    description: Description of the Staged Upgrade Group. Length must be 1 to 255 characters.
+    description: Description of the Staged Upgrade Group. Length must be 1 to 255
+      characters.
     type: str
   groupId:
     description: GroupId path parameter. Group ID.
@@ -61,128 +65,120 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesStagedGroup
-  description: Complete reference of the createNetworkFirmwareUpgradesStagedGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-staged-group
-- name: Cisco Meraki documentation for networks deleteNetworkFirmwareUpgradesStagedGroup
-  description: Complete reference of the deleteNetworkFirmwareUpgradesStagedGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-firmware-upgrades-staged-group
-- name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedGroup
-  description: Complete reference of the updateNetworkFirmwareUpgradesStagedGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-group
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_firmware_upgrades_staged_group,
-    networks.Networks.delete_network_firmware_upgrades_staged_group,
-    networks.Networks.update_network_firmware_upgrades_staged_group,
-
-  - Paths used are
-    post /networks/{networkId}/firmwareUpgrades/staged/groups,
-    delete /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId},
-    put /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId},
+  - description: Complete reference of the createNetworkFirmwareUpgradesStagedGroup
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-firmware-upgrades-staged-group
+    name: Cisco Meraki documentation for networks createNetworkFirmwareUpgradesStagedGroup
+  - description: Complete reference of the deleteNetworkFirmwareUpgradesStagedGroup
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-firmware-upgrades-staged-group
+    name: Cisco Meraki documentation for networks deleteNetworkFirmwareUpgradesStagedGroup
+  - description: Complete reference of the updateNetworkFirmwareUpgradesStagedGroup
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-group
+    name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedGroup
+short_description: Resource module for networks _firmware _upgrades _staged _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_firmware_upgrades_staged_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     assignedDevices:
       devices:
-      - name: Device Name
-        serial: Q234-ABCD-5678
+        - name: Device Name
+          serial: Q234-ABCD-5678
       switchStacks:
-      - id: '1234'
-        name: Stack Name
+        - id: '1234'
+          name: Stack Name
     description: The description of the group
     isDefault: false
     name: My Staged Upgrade Group
     networkId: string
-
 - name: Delete by id
   cisco.meraki.networks_firmware_upgrades_staged_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     groupId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_firmware_upgrades_staged_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     assignedDevices:
       devices:
-      - name: Device Name
-        serial: Q234-ABCD-5678
+        - name: Device Name
+          serial: Q234-ABCD-5678
       switchStacks:
-      - id: '1234'
-        name: Stack Name
+        - id: '1234'
+          name: Stack Name
     description: The description of the group
     groupId: string
     isDefault: false
     name: My Staged Upgrade Group
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_groups_info.py b/plugins/modules/networks_firmware_upgrades_staged_groups_info.py
index 964c3c724..fed72d39f 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_groups_info.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_groups_info.py
@@ -5,102 +5,96 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_groups_info
-short_description: Information module for networks _firmware _upgrades _staged _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _firmware _upgrades _staged _groups.
-- Get networks _firmware _upgrades _staged _groups by id.
-- Get a Staged Upgrade Group from a network.
-- List of Staged Upgrade Groups in a network.
-version_added: '2.16.0'
+  - Get all networks _firmware _upgrades _staged _groups.
+  - Get networks _firmware _upgrades _staged _groups by id.
+  - Get a Staged Upgrade Group from a network.
+  - List of Staged Upgrade Groups in a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_groups_info
+notes:
+  - SDK Method used are networks.Networks.get_network_firmware_upgrades_staged_group,
+    networks.Networks.get_network_firmware_upgrades_staged_groups,
+  - Paths used are get /networks/{networkId}/firmwareUpgrades/staged/groups, get /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId},
 options:
+  groupId:
+    description:
+      - GroupId path parameter. Group ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  groupId:
-    description:
-    - GroupId path parameter. Group ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedGroup
-  description: Complete reference of the getNetworkFirmwareUpgradesStagedGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-group
-- name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedGroups
-  description: Complete reference of the getNetworkFirmwareUpgradesStagedGroups API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-groups
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_firmware_upgrades_staged_group,
-    networks.Networks.get_network_firmware_upgrades_staged_groups,
-
-  - Paths used are
-    get /networks/{networkId}/firmwareUpgrades/staged/groups,
-    get /networks/{networkId}/firmwareUpgrades/staged/groups/{groupId},
+  - description: Complete reference of the getNetworkFirmwareUpgradesStagedGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-group
+    name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedGroup
+  - description: Complete reference of the getNetworkFirmwareUpgradesStagedGroups
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-groups
+    name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedGroups
+short_description: Information module for networks _firmware _upgrades _staged _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _firmware _upgrades _staged _groups
   cisco.meraki.networks_firmware_upgrades_staged_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _firmware _upgrades _staged _groups by id
   cisco.meraki.networks_firmware_upgrades_staged_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     groupId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_stages.py b/plugins/modules/networks_firmware_upgrades_staged_stages.py
index 534cb3c8d..6f59c9579 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_stages.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_stages.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_stages
-short_description: Resource module for networks _firmware _upgrades _staged _stages
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _firmware _upgrades _staged _stages.
-- Assign Staged Upgrade Group order in the sequence.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _firmware _upgrades _staged _stages.
+  - Assign Staged Upgrade Group order in the sequence.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_stages
+notes:
+  - SDK Method used are networks.Networks.update_network_firmware_upgrades_staged_stages,
+  - Paths used are put /networks/{networkId}/firmwareUpgrades/staged/stages,
 options:
   _json:
     description: Array of Staged Upgrade Groups.
@@ -32,49 +32,45 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedStages
-  description: Complete reference of the updateNetworkFirmwareUpgradesStagedStages API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-stages
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_firmware_upgrades_staged_stages,
-
-  - Paths used are
-    put /networks/{networkId}/firmwareUpgrades/staged/stages,
+  - description: Complete reference of the updateNetworkFirmwareUpgradesStagedStages
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-firmware-upgrades-staged-stages
+    name: Cisco Meraki documentation for networks updateNetworkFirmwareUpgradesStagedStages
+short_description: Resource module for networks _firmware _upgrades _staged _stages
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_firmware_upgrades_staged_stages:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     _json:
-    - group:
-        id: '1234'
+      - group:
+          id: '1234'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_firmware_upgrades_staged_stages_info.py b/plugins/modules/networks_firmware_upgrades_staged_stages_info.py
index 2db3fb685..56febe238 100644
--- a/plugins/modules/networks_firmware_upgrades_staged_stages_info.py
+++ b/plugins/modules/networks_firmware_upgrades_staged_stages_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_firmware_upgrades_staged_stages_info
-short_description: Information module for networks _firmware _upgrades _staged _stages
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _firmware _upgrades _staged _stages.
-- Order of Staged Upgrade Groups in a network.
-version_added: '2.16.0'
+  - Get all networks _firmware _upgrades _staged _stages.
+  - Order of Staged Upgrade Groups in a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_firmware_upgrades_staged_stages_info
+notes:
+  - SDK Method used are networks.Networks.get_network_firmware_upgrades_staged_stages,
+  - Paths used are get /networks/{networkId}/firmwareUpgrades/staged/stages,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedStages
-  description: Complete reference of the getNetworkFirmwareUpgradesStagedStages API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-stages
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_firmware_upgrades_staged_stages,
-
-  - Paths used are
-    get /networks/{networkId}/firmwareUpgrades/staged/stages,
+  - description: Complete reference of the getNetworkFirmwareUpgradesStagedStages
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-firmware-upgrades-staged-stages
+    name: Cisco Meraki documentation for networks getNetworkFirmwareUpgradesStagedStages
+short_description: Information module for networks _firmware _upgrades _staged _stages
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _firmware _upgrades _staged _stages
   cisco.meraki.networks_firmware_upgrades_staged_stages_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_floor_plans.py b/plugins/modules/networks_floor_plans.py
index 514c968ab..5eb593d0b 100644
--- a/plugins/modules/networks_floor_plans.py
+++ b/plugins/modules/networks_floor_plans.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_floor_plans
-short_description: Resource module for networks _floor _plans
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _floor _plans.
-- Upload a floor plan.
-- Destroy a floor plan.
-- Update a floor plan's geolocation and other meta data.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _floor _plans.
+  - Upload a floor plan.
+  - Destroy a floor plan.
+  - Update a floor plan's geolocation and other meta data.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_floor_plans
+notes:
+  - SDK Method used are networks.Networks.create_network_floor_plan, networks.Networks.delete_network_floor_plan,
+    networks.Networks.update_network_floor_plan,
+  - Paths used are post /networks/{networkId}/floorPlans, delete /networks/{networkId}/floorPlans/{floorPlanId},
+    put /networks/{networkId}/floorPlans/{floorPlanId},
 options:
   bottomLeftCorner:
     description: The longitude and latitude of the bottom left corner of your floor
@@ -41,15 +43,15 @@
         type: float
     type: dict
   center:
-    description: The longitude and latitude of the center of your floor plan. The 'center'
-      or two adjacent corners (e.g. 'topLeftCorner' and 'bottomLeftCorner') must be
-      specified. If 'center' is specified, the floor plan is placed over that point
-      with no rotation. If two adjacent corners are specified, the floor plan is rotated
-      to line up with the two specified points. The aspect ratio of the floor plan's
-      image is preserved regardless of which corners/center are specified. (This means
-      if that more than two corners are specified, only two corners may be used to preserve
-      the floor plan's aspect ratio.). No two points can have the same latitude, longitude
-      pair.
+    description: The longitude and latitude of the center of your floor plan. The
+      'center' or two adjacent corners (e.g. 'topLeftCorner' and 'bottomLeftCorner')
+      must be specified. If 'center' is specified, the floor plan is placed over that
+      point with no rotation. If two adjacent corners are specified, the floor plan
+      is rotated to line up with the two specified points. The aspect ratio of the
+      floor plan's image is preserved regardless of which corners/center are specified.
+      (This means if that more than two corners are specified, only two corners may
+      be used to preserve the floor plan's aspect ratio.). No two points can have
+      the same latitude, longitude pair.
     suboptions:
       lat:
         description: Latitude.
@@ -63,8 +65,8 @@
     type: str
   imageContents:
     description: The file contents (a base 64 encoded string) of your image. Supported
-      formats are PNG, GIF, and JPG. Note that all images are saved as PNG files, regardless
-      of the format they are uploaded in.
+      formats are PNG, GIF, and JPG. Note that all images are saved as PNG files,
+      regardless of the format they are uploaded in.
     type: str
   name:
     description: The name of your floor plan.
@@ -83,7 +85,8 @@
         type: float
     type: dict
   topRightCorner:
-    description: The longitude and latitude of the top right corner of your floor plan.
+    description: The longitude and latitude of the top right corner of your floor
+      plan.
     suboptions:
       lat:
         description: Latitude.
@@ -93,53 +96,45 @@
         type: float
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkFloorPlan
-  description: Complete reference of the createNetworkFloorPlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-floor-plan
-- name: Cisco Meraki documentation for networks deleteNetworkFloorPlan
-  description: Complete reference of the deleteNetworkFloorPlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-floor-plan
-- name: Cisco Meraki documentation for networks updateNetworkFloorPlan
-  description: Complete reference of the updateNetworkFloorPlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-floor-plan
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_floor_plan,
-    networks.Networks.delete_network_floor_plan,
-    networks.Networks.update_network_floor_plan,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans,
-    delete /networks/{networkId}/floorPlans/{floorPlanId},
-    put /networks/{networkId}/floorPlans/{floorPlanId},
+  - description: Complete reference of the createNetworkFloorPlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-floor-plan
+    name: Cisco Meraki documentation for networks createNetworkFloorPlan
+  - description: Complete reference of the deleteNetworkFloorPlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-floor-plan
+    name: Cisco Meraki documentation for networks deleteNetworkFloorPlan
+  - description: Complete reference of the updateNetworkFloorPlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-floor-plan
+    name: Cisco Meraki documentation for networks updateNetworkFloorPlan
+short_description: Resource module for networks _floor _plans
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_floor_plans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bottomLeftCorner:
       lat: 37.770040510499996
@@ -159,55 +154,53 @@
     topRightCorner:
       lat: 37.770040510499996
       lng: -122.38714009525
-
 - name: Delete by id
   cisco.meraki.networks_floor_plans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     floorPlanId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_floor_plans:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bottomLeftCorner:
       lat: 37.770040510499996
@@ -228,7 +221,6 @@
     topRightCorner:
       lat: 37.770040510499996
       lng: -122.38714009525
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_floor_plans_auto_locate_jobs_batch.py b/plugins/modules/networks_floor_plans_auto_locate_jobs_batch.py
index 4947078fe..64978ef7f 100644
--- a/plugins/modules/networks_floor_plans_auto_locate_jobs_batch.py
+++ b/plugins/modules/networks_floor_plans_auto_locate_jobs_batch.py
@@ -5,29 +5,30 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_floor_plans_auto_locate_jobs_batch
-short_description: Resource module for networks _floor _plans _auto _locate _jobs _batch
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _floor _plans _auto _locate _jobs _batch.
-- Schedule auto locate jobs for one or more floor plans in a network.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _floor _plans _auto _locate _jobs
+    _batch.
+  - Schedule auto locate jobs for one or more floor plans in a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_floor_plans_auto_locate_jobs_batch
+notes:
+  - SDK Method used are networks.Networks.batch_network_floor_plans_auto_locate_jobs,
+  - Paths used are post /networks/{networkId}/floorPlans/autoLocate/jobs/batch,
 options:
   jobs:
-    description: The list of auto locate jobs to be scheduled. Up to 100 jobs can be
-      provided in a request.
+    description: The list of auto locate jobs to be scheduled. Up to 100 jobs can
+      be provided in a request.
     elements: dict
     suboptions:
       floorPlanId:
         description: The ID of the floor plan to run auto locate for.
         type: str
       refresh:
-        description: The types of location data that should be refreshed for this job.
-          The list must either contain both 'gnss' and 'ranging' or be empty, as we
-          currently only support refreshing both 'gnss' and 'ranging', or neither.
+        description: The types of location data that should be refreshed for this
+          job. The list must either contain both 'gnss' and 'ranging' or be empty,
+          as we currently only support refreshing both 'gnss' and 'ranging', or neither.
         elements: str
         type: list
       scheduledAt:
@@ -39,51 +40,47 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks batchNetworkFloorPlansAutoLocateJobs
-  description: Complete reference of the batchNetworkFloorPlansAutoLocateJobs API.
-  link: https://developer.cisco.com/meraki/api-v1/#!batch-network-floor-plans-auto-locate-jobs
-notes:
-  - SDK Method used are
-    networks.Networks.batch_network_floor_plans_auto_locate_jobs,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans/autoLocate/jobs/batch,
+  - description: Complete reference of the batchNetworkFloorPlansAutoLocateJobs API.
+    link: https://developer.cisco.com/meraki/api-v1/#!batch-network-floor-plans-auto-locate-jobs
+    name: Cisco Meraki documentation for networks batchNetworkFloorPlansAutoLocateJobs
+short_description: Resource module for networks _floor _plans _auto _locate _jobs
+  _batch
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_floor_plans_auto_locate_jobs_batch:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     jobs:
-    - floorPlanId: g_2176982374
-      refresh:
-      - gnss
-      - ranging
-      scheduledAt: '2018-02-11T00:00:00Z'
+      - floorPlanId: g_2176982374
+        refresh:
+          - gnss
+          - ranging
+        scheduledAt: '2018-02-11T00:00:00Z'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_floor_plans_devices_batch_update.py b/plugins/modules/networks_floor_plans_devices_batch_update.py
index 2a29ed060..a0371e849 100644
--- a/plugins/modules/networks_floor_plans_devices_batch_update.py
+++ b/plugins/modules/networks_floor_plans_devices_batch_update.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_floor_plans_devices_batch_update
-short_description: Resource module for networks _floor _plans _devices _batch _update
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _floor _plans _devices _batch _update.
-- Update floorplan assignments for a batch of devices.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _floor _plans _devices _batch
+    _update.
+  - Update floorplan assignments for a batch of devices.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_floor_plans_devices_batch_update
+notes:
+  - SDK Method used are networks.Networks.batch_network_floor_plans_devices_update,
+  - Paths used are post /networks/{networkId}/floorPlans/devices/batchUpdate,
 options:
   assignments:
     description: List of floorplan assignments to update. Up to 100 floor plan assignments
@@ -25,8 +26,8 @@
         description: Floorplan to be assigned or unassigned.
         suboptions:
           id:
-            description: The ID of the floor plan to assign the device to, or null to
-              unassign the device from its floor plan.
+            description: The ID of the floor plan to assign the device to, or null
+              to unassign the device from its floor plan.
             type: str
         type: dict
       serial:
@@ -37,49 +38,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks batchNetworkFloorPlansDevicesUpdate
-  description: Complete reference of the batchNetworkFloorPlansDevicesUpdate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!batch-network-floor-plans-devices-update
-notes:
-  - SDK Method used are
-    networks.Networks.batch_network_floor_plans_devices_update,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans/devices/batchUpdate,
+  - description: Complete reference of the batchNetworkFloorPlansDevicesUpdate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!batch-network-floor-plans-devices-update
+    name: Cisco Meraki documentation for networks batchNetworkFloorPlansDevicesUpdate
+short_description: Resource module for networks _floor _plans _devices _batch _update
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_floor_plans_devices_batch_update:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     assignments:
-    - floorPlan:
-        id: g_2176982374
-      serial: Q234-ABCD-5678
+      - floorPlan:
+          id: g_2176982374
+        serial: Q234-ABCD-5678
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_floor_plans_info.py b/plugins/modules/networks_floor_plans_info.py
index d5e861626..e84add53c 100644
--- a/plugins/modules/networks_floor_plans_info.py
+++ b/plugins/modules/networks_floor_plans_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_floor_plans_info
-short_description: Information module for networks _floor _plans
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _floor _plans.
-- Get networks _floor _plans by id.
-- Find a floor plan by ID.
-- List the floor plans that belong to your network.
-version_added: '2.16.0'
+  - Get all networks _floor _plans.
+  - Get networks _floor _plans by id.
+  - Find a floor plan by ID.
+  - List the floor plans that belong to your network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_floor_plans_info
+notes:
+  - SDK Method used are networks.Networks.get_network_floor_plan, networks.Networks.get_network_floor_plans,
+  - Paths used are get /networks/{networkId}/floorPlans, get /networks/{networkId}/floorPlans/{floorPlanId},
 options:
+  floorPlanId:
+    description:
+      - FloorPlanId path parameter. Floor plan ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  floorPlanId:
-    description:
-    - FloorPlanId path parameter. Floor plan ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkFloorPlan
-  description: Complete reference of the getNetworkFloorPlan API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-floor-plan
-- name: Cisco Meraki documentation for networks getNetworkFloorPlans
-  description: Complete reference of the getNetworkFloorPlans API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-floor-plans
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_floor_plan,
-    networks.Networks.get_network_floor_plans,
-
-  - Paths used are
-    get /networks/{networkId}/floorPlans,
-    get /networks/{networkId}/floorPlans/{floorPlanId},
+  - description: Complete reference of the getNetworkFloorPlan API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-floor-plan
+    name: Cisco Meraki documentation for networks getNetworkFloorPlan
+  - description: Complete reference of the getNetworkFloorPlans API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-floor-plans
+    name: Cisco Meraki documentation for networks getNetworkFloorPlans
+short_description: Information module for networks _floor _plans
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _floor _plans
   cisco.meraki.networks_floor_plans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _floor _plans by id
   cisco.meraki.networks_floor_plans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     floorPlanId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_group_policies.py b/plugins/modules/networks_group_policies.py
index 76f09b057..eaef69f05 100644
--- a/plugins/modules/networks_group_policies.py
+++ b/plugins/modules/networks_group_policies.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_group_policies
-short_description: Resource module for networks _group _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _group _policies.
-- Create a group policy.
-- Delete a group policy.
-- Update a group policy.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _group _policies.
+  - Create a group policy.
+  - Delete a group policy.
+  - Update a group policy.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_group_policies
+notes:
+  - SDK Method used are networks.Networks.create_network_group_policy, networks.Networks.delete_network_group_policy,
+    networks.Networks.update_network_group_policy,
+  - Paths used are post /networks/{networkId}/groupPolicies, delete /networks/{networkId}/groupPolicies/{groupPolicyId},
+    put /networks/{networkId}/groupPolicies/{groupPolicyId},
 options:
   bandwidth:
     description: The bandwidth settings for clients bound to your group policy.
@@ -36,8 +38,8 @@
             type: int
         type: dict
       settings:
-        description: How bandwidth limits are enforced. Can be 'network default', 'ignore'
-          or 'custom'.
+        description: How bandwidth limits are enforced. Can be 'network default',
+          'ignore' or 'custom'.
         type: str
     type: dict
   bonjourForwarding:
@@ -45,18 +47,18 @@
       has a wireless configuration.
     suboptions:
       rules:
-        description: A list of the Bonjour forwarding rules for your group policy. If
-          'settings' is set to 'custom', at least one rule must be specified.
+        description: A list of the Bonjour forwarding rules for your group policy.
+          If 'settings' is set to 'custom', at least one rule must be specified.
         elements: dict
         suboptions:
           description:
             description: A description for your Bonjour forwarding rule. Optional.
             type: str
           services:
-            description: A list of Bonjour services. At least one service must be specified.
-              Available services are 'All Services', 'AFP', 'AirPlay', 'Apple screen
-              share', 'BitTorrent', 'Chromecast', 'FTP', 'iChat', 'iTunes', 'Printers',
-              'Samba', 'Scanners', 'Spotify' and 'SSH'.
+            description: A list of Bonjour services. At least one service must be
+              specified. Available services are 'All Services', 'AFP', 'AirPlay',
+              'Apple screen share', 'BitTorrent', 'Chromecast', 'FTP', 'iChat', 'iTunes',
+              'Printers', 'Samba', 'Scanners', 'Spotify' and 'SSH'.
             elements: str
             type: list
           vlanId:
@@ -91,8 +93,8 @@
             elements: str
             type: list
           settings:
-            description: How URL categories are applied. Can be 'network default', 'append'
-              or 'override'.
+            description: How URL categories are applied. Can be 'network default',
+              'append' or 'override'.
             type: str
         type: dict
       blockedUrlPatterns:
@@ -159,8 +161,8 @@
         type: str
       trafficShapingRules:
         description: An array of traffic shaping rules. Rules are applied in the order
-          that they are specified in. An empty list (or null) means no rules. Note that
-          you are allowed a maximum of 8 rules.
+          that they are specified in. An empty list (or null) means no rules. Note
+          that you are allowed a maximum of 8 rules.
         elements: dict
         suboptions:
           definitions:
@@ -169,18 +171,18 @@
             elements: dict
             suboptions:
               type:
-                description: The type of definition. Can be one of 'application', 'applicationCategory',
-                  'host', 'port', 'ipRange' or 'localNet'.
+                description: The type of definition. Can be one of 'application',
+                  'applicationCategory', 'host', 'port', 'ipRange' or 'localNet'.
                 type: str
               value:
-                description: If "type" is 'host', 'port', 'ipRange' or 'localNet', then
-                  "value" must be a string, matching either a hostname (e.g. "somesite.com"),
-                  a port (e.g. 8080), or an IP range ("192.1.0.0", "192.1.0.0/16", or
-                  "10.1.0.0/16 80"). 'localNet' also supports CIDR notation, excluding
-                  custom ports. If "type" is 'application' or 'applicationCategory',
-                  then "value" must be an object with the structure { "id" "meraki layer7/..."
-                  }, where "id" is the application category or application ID (for a
-                  list of IDs for your network, use the trafficShaping/applicationCategories
+                description: If "type" is 'host', 'port', 'ipRange' or 'localNet',
+                  then "value" must be a string, matching either a hostname (e.g.
+                  "somesite.com"), a port (e.g. 8080), or an IP range ("192.1.0.0",
+                  "192.1.0.0/16", or "10.1.0.0/16 80"). 'localNet' also supports CIDR
+                  notation, excluding custom ports. If "type" is 'application' or
+                  'applicationCategory', then "value" must be an object with the structure
+                  { "id" "meraki layer7/..." }, where "id" is the application category
+                  or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories
                   endpoint).
                 type: str
             type: list
@@ -209,20 +211,21 @@
                     type: int
                 type: dict
               settings:
-                description: How bandwidth limits are applied by your rule. Can be one
-                  of 'network default', 'ignore' or 'custom'.
+                description: How bandwidth limits are applied by your rule. Can be
+                  one of 'network default', 'ignore' or 'custom'.
                 type: str
             type: dict
           priority:
-            description: A string, indicating the priority level for packets bound to
-              your rule. Can be 'low', 'normal' or 'high'.
+            description: A string, indicating the priority level for packets bound
+              to your rule. Can be 'low', 'normal' or 'high'.
             type: str
         type: list
     type: dict
   force:
-    description: Force query parameter. If true, the system deletes the GP even if there
-      are active clients using the GP. After deletion, active clients that were assigned
-      to that Group Policy will be left without any policy applied. Default is false.
+    description: Force query parameter. If true, the system deletes the GP even if
+      there are active clients using the GP. After deletion, active clients that were
+      assigned to that Group Policy will be left without any policy applied. Default
+      is false.
     type: bool
   groupPolicyId:
     description: GroupPolicyId path parameter. Group policy ID.
@@ -234,25 +237,25 @@
     description: NetworkId path parameter. Network ID.
     type: str
   scheduling:
-    description: The schedule for the group policy. Schedules are applied to days of
-      the week.
+    description: The schedule for the group policy. Schedules are applied to days
+      of the week.
     suboptions:
       enabled:
         description: Whether scheduling is enabled (true) or disabled (false). Defaults
-          to false. If true, the schedule objects for each day of the week (monday -
-          sunday) are parsed.
+          to false. If true, the schedule objects for each day of the week (monday
+          - sunday) are parsed.
         type: bool
       friday:
         description: The schedule object for Friday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -264,13 +267,13 @@
         description: The schedule object for Monday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -282,13 +285,13 @@
         description: The schedule object for Saturday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -300,13 +303,13 @@
         description: The schedule object for Sunday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -318,13 +321,13 @@
         description: The schedule object for Thursday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -336,13 +339,13 @@
         description: The schedule object for Tuesday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -354,13 +357,13 @@
         description: The schedule object for Wednesday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -371,8 +374,8 @@
     type: dict
   splashAuthSettings:
     description: Whether clients bound to your policy will bypass splash authorization
-      or behave according to the network's rules. Can be one of 'network default' or
-      'bypass'. Only available if your network has a wireless configuration.
+      or behave according to the network's rules. Can be one of 'network default'
+      or 'bypass'. Only available if your network has a wireless configuration.
     type: str
   vlanTagging:
     description: The VLAN tagging settings for your group policy. Only available if
@@ -388,53 +391,45 @@
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkGroupPolicy
-  description: Complete reference of the createNetworkGroupPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-group-policy
-- name: Cisco Meraki documentation for networks deleteNetworkGroupPolicy
-  description: Complete reference of the deleteNetworkGroupPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-group-policy
-- name: Cisco Meraki documentation for networks updateNetworkGroupPolicy
-  description: Complete reference of the updateNetworkGroupPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-group-policy
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_group_policy,
-    networks.Networks.delete_network_group_policy,
-    networks.Networks.update_network_group_policy,
-
-  - Paths used are
-    post /networks/{networkId}/groupPolicies,
-    delete /networks/{networkId}/groupPolicies/{groupPolicyId},
-    put /networks/{networkId}/groupPolicies/{groupPolicyId},
+  - description: Complete reference of the createNetworkGroupPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-group-policy
+    name: Cisco Meraki documentation for networks createNetworkGroupPolicy
+  - description: Complete reference of the deleteNetworkGroupPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-group-policy
+    name: Cisco Meraki documentation for networks deleteNetworkGroupPolicy
+  - description: Complete reference of the updateNetworkGroupPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-group-policy
+    name: Cisco Meraki documentation for networks updateNetworkGroupPolicy
+short_description: Resource module for networks _group _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_group_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bandwidth:
       bandwidthLimits:
@@ -443,10 +438,10 @@
       settings: custom
     bonjourForwarding:
       rules:
-      - description: A simple bonjour rule
-        services:
-        - All Services
-        vlanId: '1'
+        - description: A simple bonjour rule
+          services:
+            - All Services
+          vlanId: '1'
       settings: custom
     contentFiltering:
       allowedUrlPatterns:
@@ -454,39 +449,39 @@
         settings: network default
       blockedUrlCategories:
         categories:
-        - meraki:contentFiltering/category/1
-        - meraki:contentFiltering/category/7
+          - meraki:contentFiltering/category/1
+          - meraki:contentFiltering/category/7
         settings: override
       blockedUrlPatterns:
         patterns:
-        - http://www.example.com
-        - http://www.betting.com
+          - http://www.example.com
+          - http://www.betting.com
         settings: append
     firewallAndTrafficShaping:
       l3FirewallRules:
-      - comment: Allow TCP traffic to subnet with HTTP servers.
-        destCidr: 192.168.1.0/24
-        destPort: '443'
-        policy: allow
-        protocol: tcp
+        - comment: Allow TCP traffic to subnet with HTTP servers.
+          destCidr: 192.168.1.0/24
+          destPort: '443'
+          policy: allow
+          protocol: tcp
       l7FirewallRules:
-      - policy: deny
-        type: host
-        value: google.com
+        - policy: deny
+          type: host
+          value: google.com
       settings: custom
       trafficShapingRules:
-      - definitions:
-        - type: host
-          value: google.com
-        dscpTagValue: 0
-        pcpTagValue: 0
-        perClientBandwidthLimits:
-          bandwidthLimits:
-            limitDown: 1000000
-            limitUp: 1000000
-          settings: custom
-        priority: normal
-    name: No video streaming
+        - definitions:
+            - type: host
+              value: google.com
+          dscpTagValue: 0
+          pcpTagValue: 0
+          perClientBandwidthLimits:
+            bandwidthLimits:
+              limitDown: 1000000
+              limitUp: 1000000
+            settings: custom
+          priority: normal
+    name: false video streaming
     networkId: string
     scheduling:
       enabled: true
@@ -522,56 +517,54 @@
     vlanTagging:
       settings: custom
       vlanId: '1'
-
 - name: Delete by id
   cisco.meraki.networks_group_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     force: true
     groupPolicyId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_group_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bandwidth:
       bandwidthLimits:
@@ -580,10 +573,10 @@
       settings: custom
     bonjourForwarding:
       rules:
-      - description: A simple bonjour rule
-        services:
-        - All Services
-        vlanId: '1'
+        - description: A simple bonjour rule
+          services:
+            - All Services
+          vlanId: '1'
       settings: custom
     contentFiltering:
       allowedUrlPatterns:
@@ -591,40 +584,40 @@
         settings: network default
       blockedUrlCategories:
         categories:
-        - meraki:contentFiltering/category/1
-        - meraki:contentFiltering/category/7
+          - meraki:contentFiltering/category/1
+          - meraki:contentFiltering/category/7
         settings: override
       blockedUrlPatterns:
         patterns:
-        - http://www.example.com
-        - http://www.betting.com
+          - http://www.example.com
+          - http://www.betting.com
         settings: append
     firewallAndTrafficShaping:
       l3FirewallRules:
-      - comment: Allow TCP traffic to subnet with HTTP servers.
-        destCidr: 192.168.1.0/24
-        destPort: '443'
-        policy: allow
-        protocol: tcp
+        - comment: Allow TCP traffic to subnet with HTTP servers.
+          destCidr: 192.168.1.0/24
+          destPort: '443'
+          policy: allow
+          protocol: tcp
       l7FirewallRules:
-      - policy: deny
-        type: host
-        value: google.com
+        - policy: deny
+          type: host
+          value: google.com
       settings: custom
       trafficShapingRules:
-      - definitions:
-        - type: host
-          value: google.com
-        dscpTagValue: 0
-        pcpTagValue: 0
-        perClientBandwidthLimits:
-          bandwidthLimits:
-            limitDown: 1000000
-            limitUp: 1000000
-          settings: custom
-        priority: normal
+        - definitions:
+            - type: host
+              value: google.com
+          dscpTagValue: 0
+          pcpTagValue: 0
+          perClientBandwidthLimits:
+            bandwidthLimits:
+              limitDown: 1000000
+              limitUp: 1000000
+            settings: custom
+          priority: normal
     groupPolicyId: string
-    name: No video streaming
+    name: false video streaming
     networkId: string
     scheduling:
       enabled: true
@@ -660,7 +653,6 @@
     vlanTagging:
       settings: custom
       vlanId: '1'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_group_policies_info.py b/plugins/modules/networks_group_policies_info.py
index 010b8b86e..80525f426 100644
--- a/plugins/modules/networks_group_policies_info.py
+++ b/plugins/modules/networks_group_policies_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_group_policies_info
-short_description: Information module for networks _group _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _group _policies.
-- Get networks _group _policies by id.
-- Display a group policy.
-- List the group policies in a network.
-version_added: '2.16.0'
+  - Get all networks _group _policies.
+  - Get networks _group _policies by id.
+  - Display a group policy.
+  - List the group policies in a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_group_policies_info
+notes:
+  - SDK Method used are networks.Networks.get_network_group_policies, networks.Networks.get_network_group_policy,
+  - Paths used are get /networks/{networkId}/groupPolicies, get /networks/{networkId}/groupPolicies/{groupPolicyId},
 options:
+  groupPolicyId:
+    description:
+      - GroupPolicyId path parameter. Group policy ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  groupPolicyId:
-    description:
-    - GroupPolicyId path parameter. Group policy ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkGroupPolicies
-  description: Complete reference of the getNetworkGroupPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-group-policies
-- name: Cisco Meraki documentation for networks getNetworkGroupPolicy
-  description: Complete reference of the getNetworkGroupPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-group-policy
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_group_policies,
-    networks.Networks.get_network_group_policy,
-
-  - Paths used are
-    get /networks/{networkId}/groupPolicies,
-    get /networks/{networkId}/groupPolicies/{groupPolicyId},
+  - description: Complete reference of the getNetworkGroupPolicies API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-group-policies
+    name: Cisco Meraki documentation for networks getNetworkGroupPolicies
+  - description: Complete reference of the getNetworkGroupPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-group-policy
+    name: Cisco Meraki documentation for networks getNetworkGroupPolicy
+short_description: Information module for networks _group _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _group _policies
   cisco.meraki.networks_group_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _group _policies by id
   cisco.meraki.networks_group_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     groupPolicyId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_health_alerts_info.py b/plugins/modules/networks_health_alerts_info.py
index 3cbb0776f..b05d4ba4b 100644
--- a/plugins/modules/networks_health_alerts_info.py
+++ b/plugins/modules/networks_health_alerts_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_health_alerts_info
-short_description: Information module for networks _health _alerts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _health _alerts.
-- Return all global alerts on this network.
-version_added: '2.16.0'
+  - Get all networks _health _alerts.
+  - Return all global alerts on this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_health_alerts_info
+notes:
+  - SDK Method used are networks.Networks.get_network_health_alerts,
+  - Paths used are get /networks/{networkId}/health/alerts,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkHealthAlerts
-  description: Complete reference of the getNetworkHealthAlerts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-health-alerts
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_health_alerts,
-
-  - Paths used are
-    get /networks/{networkId}/health/alerts,
+  - description: Complete reference of the getNetworkHealthAlerts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-health-alerts
+    name: Cisco Meraki documentation for networks getNetworkHealthAlerts
+short_description: Information module for networks _health _alerts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _health _alerts
   cisco.meraki.networks_health_alerts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_info.py b/plugins/modules/networks_info.py
index 81a072cf1..d7b766721 100644
--- a/plugins/modules/networks_info.py
+++ b/plugins/modules/networks_info.py
@@ -5,127 +5,136 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_info
-short_description: Information module for networks
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks.
-- Get networks by id.
-- List the networks that the user has privileges on in an organization.
-- Return a network.
-version_added: '2.16.0'
+  - Get all networks.
+  - Get networks by id.
+  - List the networks that the user has privileges on in an organization.
+  - Return a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_info
+notes:
+  - SDK Method used are networks.Networks.get_network, networks.Networks.get_organization_networks,
+  - Paths used are get /networks/{networkId}, get /organizations/{organizationId}/networks,
 options:
+  configTemplateId:
+    description:
+      - 'ConfigTemplateId query parameter. An optional parameter that is the ID of
+        a config template. Will return all networks bound to that template.
+
+        '
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  isBoundToConfigTemplate:
+    description:
+      - 'IsBoundToConfigTemplate query parameter. An optional parameter to filter
+        config template bound networks. If configTemplateId is set, this cannot be
+        false.
+
+        '
+    type: bool
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  configTemplateId:
-    description:
-    - >
-      ConfigTemplateId query parameter. An optional parameter that is the ID of a config template. Will return all
-      networks bound to that template.
-    type: str
-  isBoundToConfigTemplate:
+  perPage:
     description:
-    - >
-      IsBoundToConfigTemplate query parameter. An optional parameter to filter config template bound networks. If
-      configTemplateId is set, this cannot be false.
-    type: bool
-  tags:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 100000. Default is 1000.
+    type: int
+  productTypes:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter networks by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below).
+      - 'ProductTypes query parameter. An optional parameter to filter networks by
+        product type. Results will have at least one of the included product types.
+
+        '
     elements: str
     type: list
-  tagsFilterType:
+  startingAfter:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return networks which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  productTypes:
+  tags:
     description:
-    - >
-      ProductTypes query parameter. An optional parameter to filter networks by product type. Results will have at
-      least one of the included product types.
+      - 'Tags query parameter. An optional parameter to filter networks by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below).
+
+        '
     elements: str
     type: list
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 100000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+  tagsFilterType:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return networks which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetwork
-  description: Complete reference of the getNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network
-- name: Cisco Meraki documentation for networks getOrganizationNetworks
-  description: Complete reference of the getOrganizationNetworks API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-networks
-notes:
-  - SDK Method used are
-    networks.Networks.get_network,
-    networks.Networks.get_organization_networks,
-
-  - Paths used are
-    get /networks/{networkId},
-    get /organizations/{organizationId}/networks,
+  - description: Complete reference of the getNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network
+    name: Cisco Meraki documentation for networks getNetwork
+  - description: Complete reference of the getOrganizationNetworks API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-networks
+    name: Cisco Meraki documentation for networks getOrganizationNetworks
+short_description: Information module for networks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks
   cisco.meraki.networks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     configTemplateId: string
-    isBoundToConfigTemplate: True
+    isBoundToConfigTemplate: true
     tags: []
     tagsFilterType: string
     productTypes: []
@@ -136,32 +145,30 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get networks by id
   cisco.meraki.networks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_insight_applications_health_by_time_info.py b/plugins/modules/networks_insight_applications_health_by_time_info.py
index cc619367a..c11ee68a9 100644
--- a/plugins/modules/networks_insight_applications_health_by_time_info.py
+++ b/plugins/modules/networks_insight_applications_health_by_time_info.py
@@ -5,87 +5,90 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_insight_applications_health_by_time_info
-short_description: Information module for networks _insight _applications _health _by _time
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _insight _applications _health _by _time.
-- Get application health by time.
-version_added: '2.16.0'
+  - Get all networks _insight _applications _health _by _time.
+  - Get application health by time.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_insight_applications_health_by_time_info
+notes:
+  - SDK Method used are insight.Insight.get_network_insight_application_health_by_time,
+  - Paths used are get /networks/{networkId}/insight/applications/{applicationId}/healthByTime,
 options:
+  applicationId:
+    description:
+      - ApplicationId path parameter. Application ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  applicationId:
+  resolution:
     description:
-    - ApplicationId path parameter. Application ID.
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 60, 300, 3600, 86400. The default is 300.
+
+        '
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 7 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 7 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days. The
-      default is 2 hours.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days. The default
+        is 2 hours.
+
+        '
     type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 60,
-      300, 3600, 86400. The default is 300.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for insight getNetworkInsightApplicationHealthByTime
-  description: Complete reference of the getNetworkInsightApplicationHealthByTime API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-insight-application-health-by-time
-notes:
-  - SDK Method used are
-    insight.Insight.get_network_insight_application_health_by_time,
-
-  - Paths used are
-    get /networks/{networkId}/insight/applications/{applicationId}/healthByTime,
+  - description: Complete reference of the getNetworkInsightApplicationHealthByTime
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-insight-application-health-by-time
+    name: Cisco Meraki documentation for insight getNetworkInsightApplicationHealthByTime
+short_description: Information module for networks _insight _applications _health
+  _by _time
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _insight _applications _health _by _time
   cisco.meraki.networks_insight_applications_health_by_time_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -93,7 +96,6 @@
     networkId: string
     applicationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_meraki_auth_users.py b/plugins/modules/networks_meraki_auth_users.py
index 97712f01a..d2f99127c 100644
--- a/plugins/modules/networks_meraki_auth_users.py
+++ b/plugins/modules/networks_meraki_auth_users.py
@@ -5,22 +5,29 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_meraki_auth_users
-short_description: Resource module for networks _meraki _auth _users
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _meraki _auth _users.
-- >
-   Authorize a user configured with Meraki Authentication for a network currently supports 802.1X, splash guest, and
-   client VPN users, and currently, organizations have a 50,000 user cap .
-- Delete an 802.1X RADIUS user, or deauthorize and optionally delete a splash guest or client VPN user.
-- >
-   Update a user configured with Meraki Authentication currently, 802.1X RADIUS, splash guest, and client VPN users
-   can be updated .
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _meraki _auth
+    _users.
+  - 'Authorize a user configured with Meraki Authentication for a network currently
+    supports 802.1X, splash guest, and client VPN users, and currently, organizations
+    have a 50,000 user cap .
+
+    '
+  - Delete an 802.1X RADIUS user, or deauthorize and optionally delete a splash guest
+    or client VPN user.
+  - 'Update a user configured with Meraki Authentication currently, 802.1X RADIUS,
+    splash guest, and client VPN users can be updated .
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_meraki_auth_users
+notes:
+  - SDK Method used are networks.Networks.create_network_meraki_auth_user, networks.Networks.delete_network_meraki_auth_user,
+    networks.Networks.update_network_meraki_auth_user,
+  - Paths used are post /networks/{networkId}/merakiAuthUsers, delete /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
+    put /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
 options:
   accountType:
     description: Authorization type for user. Can be 'Guest' or '802.1X' for wireless
@@ -40,17 +47,17 @@
         type: int
     type: list
   delete:
-    description: Delete query parameter. If the ID supplied is for a splash guest or
-      client VPN user, and that user is not authorized for any other networks in the
-      organization, then also delete the user. 802.1X RADIUS users are always deleted
-      regardless of this optional attribute.
+    description: Delete query parameter. If the ID supplied is for a splash guest
+      or client VPN user, and that user is not authorized for any other networks in
+      the organization, then also delete the user. 802.1X RADIUS users are always
+      deleted regardless of this optional attribute.
     type: bool
   email:
     description: Email address of the user.
     type: str
   emailPasswordToUser:
-    description: Whether or not Meraki should email the password to user. Default is
-      false.
+    description: Whether or not Meraki should email the password to user. Default
+      is false.
     type: bool
   isAdmin:
     description: Whether or not the user is a Dashboard administrator.
@@ -65,128 +72,117 @@
     description: NetworkId path parameter. Network ID.
     type: str
   password:
-    description: The password for this user account. Only required If the user is not
-      a Dashboard administrator.
+    description: The password for this user account. Only required If the user is
+      not a Dashboard administrator.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkMerakiAuthUser
-  description: Complete reference of the createNetworkMerakiAuthUser API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-meraki-auth-user
-- name: Cisco Meraki documentation for networks deleteNetworkMerakiAuthUser
-  description: Complete reference of the deleteNetworkMerakiAuthUser API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-meraki-auth-user
-- name: Cisco Meraki documentation for networks updateNetworkMerakiAuthUser
-  description: Complete reference of the updateNetworkMerakiAuthUser API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-meraki-auth-user
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_meraki_auth_user,
-    networks.Networks.delete_network_meraki_auth_user,
-    networks.Networks.update_network_meraki_auth_user,
-
-  - Paths used are
-    post /networks/{networkId}/merakiAuthUsers,
-    delete /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
-    put /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
+  - description: Complete reference of the createNetworkMerakiAuthUser API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-meraki-auth-user
+    name: Cisco Meraki documentation for networks createNetworkMerakiAuthUser
+  - description: Complete reference of the deleteNetworkMerakiAuthUser API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-meraki-auth-user
+    name: Cisco Meraki documentation for networks deleteNetworkMerakiAuthUser
+  - description: Complete reference of the updateNetworkMerakiAuthUser API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-meraki-auth-user
+    name: Cisco Meraki documentation for networks updateNetworkMerakiAuthUser
+short_description: Resource module for networks _meraki _auth _users
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_meraki_auth_users:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accountType: 802.1X
     authorizations:
-    - expiresAt: '2018-03-13T00:00:00.090210Z'
-      ssidNumber: 1
+      - expiresAt: '2018-03-13T00:00:00.090210Z'
+        ssidNumber: 1
     email: miles@meraki.com
     emailPasswordToUser: false
     isAdmin: false
     name: Miles Meraki
     networkId: string
     password: secret
-
 - name: Delete by id
   cisco.meraki.networks_meraki_auth_users:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     delete: true
     merakiAuthUserId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_meraki_auth_users:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     authorizations:
-    - expiresAt: '2018-03-13T00:00:00.090210Z'
-      ssidNumber: 1
+      - expiresAt: '2018-03-13T00:00:00.090210Z'
+        ssidNumber: 1
     emailPasswordToUser: false
     merakiAuthUserId: string
     name: Miles Meraki
     networkId: string
     password: secret
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_meraki_auth_users_info.py b/plugins/modules/networks_meraki_auth_users_info.py
index bb9bfe7dd..3ed448bc5 100644
--- a/plugins/modules/networks_meraki_auth_users_info.py
+++ b/plugins/modules/networks_meraki_auth_users_info.py
@@ -5,104 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_meraki_auth_users_info
-short_description: Information module for networks _meraki _auth _users
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _meraki _auth _users.
-- Get networks _meraki _auth _users by id.
-- >
-   List the authorized users configured under Meraki Authentication for a network splash guest or RADIUS users for a
-   wireless network, or client VPN users for a MX network .
-- Return the Meraki Auth splash guest, RADIUS, or client VPN user.
-version_added: '2.16.0'
+  - Get all networks _meraki _auth _users.
+  - Get networks _meraki _auth _users by id.
+  - 'List the authorized users configured under Meraki Authentication for a network
+    splash guest or RADIUS users for a wireless network, or client VPN users for a
+    MX network .
+
+    '
+  - Return the Meraki Auth splash guest, RADIUS, or client VPN user.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_meraki_auth_users_info
+notes:
+  - SDK Method used are networks.Networks.get_network_meraki_auth_user, networks.Networks.get_network_meraki_auth_users,
+  - Paths used are get /networks/{networkId}/merakiAuthUsers, get /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  merakiAuthUserId:
     description:
-    - NetworkId path parameter. Network ID.
+      - MerakiAuthUserId path parameter. Meraki auth user ID.
     type: str
-  merakiAuthUserId:
+  networkId:
     description:
-    - MerakiAuthUserId path parameter. Meraki auth user ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkMerakiAuthUser
-  description: Complete reference of the getNetworkMerakiAuthUser API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-meraki-auth-user
-- name: Cisco Meraki documentation for networks getNetworkMerakiAuthUsers
-  description: Complete reference of the getNetworkMerakiAuthUsers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-meraki-auth-users
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_meraki_auth_user,
-    networks.Networks.get_network_meraki_auth_users,
-
-  - Paths used are
-    get /networks/{networkId}/merakiAuthUsers,
-    get /networks/{networkId}/merakiAuthUsers/{merakiAuthUserId},
+  - description: Complete reference of the getNetworkMerakiAuthUser API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-meraki-auth-user
+    name: Cisco Meraki documentation for networks getNetworkMerakiAuthUser
+  - description: Complete reference of the getNetworkMerakiAuthUsers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-meraki-auth-users
+    name: Cisco Meraki documentation for networks getNetworkMerakiAuthUsers
+short_description: Information module for networks _meraki _auth _users
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _meraki _auth _users
   cisco.meraki.networks_meraki_auth_users_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _meraki _auth _users by id
   cisco.meraki.networks_meraki_auth_users_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     merakiAuthUserId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_mqtt_brokers.py b/plugins/modules/networks_mqtt_brokers.py
index afd5d7f9d..049dc4fe5 100644
--- a/plugins/modules/networks_mqtt_brokers.py
+++ b/plugins/modules/networks_mqtt_brokers.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_mqtt_brokers
-short_description: Resource module for networks _mqtt _brokers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _mqtt _brokers.
-- Add an MQTT broker.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _mqtt _brokers.
+  - Add an MQTT broker.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_mqtt_brokers
+notes:
+  - SDK Method used are networks.Networks.create_network_mqtt_broker,
+  - Paths used are post /networks/{networkId}/mqttBrokers,
 options:
   authentication:
     description: Authentication settings of the MQTT broker.
@@ -51,49 +51,45 @@
             description: CA Certificate of the MQTT broker.
             type: str
           verifyHostnames:
-            description: Whether the TLS hostname verification is enabled for the MQTT
-              broker.
+            description: Whether the TLS hostname verification is enabled for the
+              MQTT broker.
             type: bool
         type: dict
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkMqttBroker
-  description: Complete reference of the createNetworkMqttBroker API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-mqtt-broker
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_mqtt_broker,
-
-  - Paths used are
-    post /networks/{networkId}/mqttBrokers,
+  - description: Complete reference of the createNetworkMqttBroker API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-mqtt-broker
+    name: Cisco Meraki documentation for networks createNetworkMqttBroker
+short_description: Resource module for networks _mqtt _brokers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_mqtt_brokers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     authentication:
       password: '*****'
       username: milesmeraki
@@ -106,7 +102,6 @@
       tls:
         caCertificate: '*****'
         verifyHostnames: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_netflow.py b/plugins/modules/networks_netflow.py
index bde1d0fa0..66e7d05e0 100644
--- a/plugins/modules/networks_netflow.py
+++ b/plugins/modules/networks_netflow.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_netflow
-short_description: Resource module for networks _netflow
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _netflow.
-- Update the NetFlow traffic reporting settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _netflow.
+  - Update the NetFlow traffic reporting settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_netflow
+notes:
+  - SDK Method used are networks.Networks.update_network_netflow,
+  - Paths used are put /networks/{networkId}/netflow,
 options:
   collectorIp:
     description: The IPv4 address of the NetFlow collector.
@@ -27,8 +27,8 @@
       on.
     type: int
   etaEnabled:
-    description: Boolean indicating whether Encrypted Traffic Analytics is enabled (true)
-      or disabled (false).
+    description: Boolean indicating whether Encrypted Traffic Analytics is enabled
+      (true) or disabled (false).
     type: bool
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -38,43 +38,39 @@
       or disabled (false).
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkNetflow
-  description: Complete reference of the updateNetworkNetflow API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-netflow
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_netflow,
-
-  - Paths used are
-    put /networks/{networkId}/netflow,
+  - description: Complete reference of the updateNetworkNetflow API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-netflow
+    name: Cisco Meraki documentation for networks updateNetworkNetflow
+short_description: Resource module for networks _netflow
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_netflow:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     collectorIp: string
     collectorPort: 0
@@ -82,7 +78,6 @@
     etaEnabled: true
     networkId: string
     reportingEnabled: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_netflow_info.py b/plugins/modules/networks_netflow_info.py
index fb3168440..06759e6b0 100644
--- a/plugins/modules/networks_netflow_info.py
+++ b/plugins/modules/networks_netflow_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_netflow_info
-short_description: Information module for networks _netflow
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _netflow.
-- Return the NetFlow traffic reporting settings for a network.
-version_added: '2.16.0'
+  - Get all networks _netflow.
+  - Return the NetFlow traffic reporting settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_netflow_info
+notes:
+  - SDK Method used are networks.Networks.get_network_netflow,
+  - Paths used are get /networks/{networkId}/netflow,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkNetflow
-  description: Complete reference of the getNetworkNetflow API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-netflow
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_netflow,
-
-  - Paths used are
-    get /networks/{networkId}/netflow,
+  - description: Complete reference of the getNetworkNetflow API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-netflow
+    name: Cisco Meraki documentation for networks getNetworkNetflow
+short_description: Information module for networks _netflow
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _netflow
   cisco.meraki.networks_netflow_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_pii_pii_keys_info.py b/plugins/modules/networks_pii_pii_keys_info.py
index 4fdce8988..f5d338fc4 100644
--- a/plugins/modules/networks_pii_pii_keys_info.py
+++ b/plugins/modules/networks_pii_pii_keys_info.py
@@ -5,89 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_pii_pii_keys_info
-short_description: Information module for networks _pii _pii _keys
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _pii _pii _keys.
-- >
-   List the keys required to access Personally Identifiable Information PII for a given identifier. Exactly one
-   identifier will be accepted. If the organization contains org-wide Systems Manager users matching the key provided
-   then there will be an entry with the key "0" containing the applicable keys.
-version_added: '2.16.0'
+  - Get all networks _pii _pii _keys.
+  - 'List the keys required to access Personally Identifiable Information PII for
+    a given identifier. Exactly one identifier will be accepted. If the organization
+    contains org-wide Systems Manager users matching the key provided then there will
+    be an entry with the key "0" containing the applicable keys.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_pii_pii_keys_info
+notes:
+  - SDK Method used are networks.Networks.get_network_pii_pii_keys,
+  - Paths used are get /networks/{networkId}/pii/piiKeys,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
+  bluetoothMac:
     description:
-    - NetworkId path parameter. Network ID.
+      - BluetoothMac query parameter. The MAC of a Bluetooth client.
     type: str
-  username:
+  email:
     description:
-    - Username query parameter. The username of a Systems Manager user.
+      - Email query parameter. The email of a network user account or a Systems Manager
+        device.
     type: str
-  email:
+  headers:
+    description: Additional headers.
+    type: dict
+  imei:
     description:
-    - Email query parameter. The email of a network user account or a Systems Manager device.
+      - Imei query parameter. The IMEI of a Systems Manager device.
     type: str
   mac:
     description:
-    - Mac query parameter. The MAC of a network client device or a Systems Manager device.
+      - Mac query parameter. The MAC of a network client device or a Systems Manager
+        device.
     type: str
-  serial:
+  networkId:
     description:
-    - Serial query parameter. The serial of a Systems Manager device.
+      - NetworkId path parameter. Network ID.
     type: str
-  imei:
+  serial:
     description:
-    - Imei query parameter. The IMEI of a Systems Manager device.
+      - Serial query parameter. The serial of a Systems Manager device.
     type: str
-  bluetoothMac:
+  username:
     description:
-    - BluetoothMac query parameter. The MAC of a Bluetooth client.
+      - Username query parameter. The username of a Systems Manager user.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkPiiPiiKeys
-  description: Complete reference of the getNetworkPiiPiiKeys API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-pii-keys
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_pii_pii_keys,
-
-  - Paths used are
-    get /networks/{networkId}/pii/piiKeys,
+  - description: Complete reference of the getNetworkPiiPiiKeys API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-pii-keys
+    name: Cisco Meraki documentation for networks getNetworkPiiPiiKeys
+short_description: Information module for networks _pii _pii _keys
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _pii _pii _keys
   cisco.meraki.networks_pii_pii_keys_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     username: string
     email: string
     mac: string
@@ -96,7 +96,6 @@
     bluetoothMac: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_pii_requests_delete.py b/plugins/modules/networks_pii_requests_delete.py
index 5d28450cc..a110c299c 100644
--- a/plugins/modules/networks_pii_requests_delete.py
+++ b/plugins/modules/networks_pii_requests_delete.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_pii_requests_delete
-short_description: Resource module for networks _pii _requests _delete
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation delete of the resource networks _pii _requests _delete.
-- Delete a restrict processing PII request.
-version_added: '2.16.0'
+  - Manage operation delete of the resource networks _pii _requests _delete.
+  - Delete a restrict processing PII request.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_pii_requests_delete
+notes:
+  - SDK Method used are networks.Networks.delete_network_pii_request,
+  - Paths used are delete /networks/{networkId}/pii/requests/{requestId},
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +23,41 @@
     description: RequestId path parameter. Request ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks deleteNetworkPiiRequest
-  description: Complete reference of the deleteNetworkPiiRequest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-pii-request
-notes:
-  - SDK Method used are
-    networks.Networks.delete_network_pii_request,
-
-  - Paths used are
-    delete /networks/{networkId}/pii/requests/{requestId},
+  - description: Complete reference of the deleteNetworkPiiRequest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-pii-request
+    name: Cisco Meraki documentation for networks deleteNetworkPiiRequest
+short_description: Resource module for networks _pii _requests _delete
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Delete by id
   cisco.meraki.networks_pii_requests_delete:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     requestId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_pii_requests_info.py b/plugins/modules/networks_pii_requests_info.py
index 5608b757a..3c9b9de51 100644
--- a/plugins/modules/networks_pii_requests_info.py
+++ b/plugins/modules/networks_pii_requests_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_pii_requests_info
-short_description: Information module for networks _pii _requests
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _pii _requests.
-- Get networks _pii _requests by id.
-- List the PII requests for this network or organization.
-- Return a PII request.
-version_added: '2.16.0'
+  - Get all networks _pii _requests.
+  - Get networks _pii _requests by id.
+  - List the PII requests for this network or organization.
+  - Return a PII request.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_pii_requests_info
+notes:
+  - SDK Method used are networks.Networks.get_network_pii_request, networks.Networks.get_network_pii_requests,
+  - Paths used are get /networks/{networkId}/pii/requests, get /networks/{networkId}/pii/requests/{requestId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   requestId:
     description:
-    - RequestId path parameter. Request ID.
+      - RequestId path parameter. Request ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkPiiRequest
-  description: Complete reference of the getNetworkPiiRequest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-request
-- name: Cisco Meraki documentation for networks getNetworkPiiRequests
-  description: Complete reference of the getNetworkPiiRequests API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-requests
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_pii_request,
-    networks.Networks.get_network_pii_requests,
-
-  - Paths used are
-    get /networks/{networkId}/pii/requests,
-    get /networks/{networkId}/pii/requests/{requestId},
+  - description: Complete reference of the getNetworkPiiRequest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-request
+    name: Cisco Meraki documentation for networks getNetworkPiiRequest
+  - description: Complete reference of the getNetworkPiiRequests API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-requests
+    name: Cisco Meraki documentation for networks getNetworkPiiRequests
+short_description: Information module for networks _pii _requests
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _pii _requests
   cisco.meraki.networks_pii_requests_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _pii _requests by id
   cisco.meraki.networks_pii_requests_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     requestId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_pii_sm_devices_for_key_info.py b/plugins/modules/networks_pii_sm_devices_for_key_info.py
index 80beb47f6..aba1cd2c6 100644
--- a/plugins/modules/networks_pii_sm_devices_for_key_info.py
+++ b/plugins/modules/networks_pii_sm_devices_for_key_info.py
@@ -5,89 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_pii_sm_devices_for_key_info
-short_description: Information module for networks _pii _sm _devices _for _key
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _pii _sm _devices _for _key.
-- >
-   Given a piece of Personally Identifiable Information PII , return the Systems Manager device IDs associated with
-   that identifier. These device IDs can be used with the Systems Manager API endpoints to retrieve device details.
-   Exactly one identifier will be accepted.
-version_added: '2.16.0'
+  - Get all networks _pii _sm _devices _for _key.
+  - 'Given a piece of Personally Identifiable Information PII , return the Systems
+    Manager device IDs associated with that identifier. These device IDs can be used
+    with the Systems Manager API endpoints to retrieve device details. Exactly one
+    identifier will be accepted.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_pii_sm_devices_for_key_info
+notes:
+  - SDK Method used are networks.Networks.get_network_pii_sm_devices_for_key,
+  - Paths used are get /networks/{networkId}/pii/smDevicesForKey,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
+  bluetoothMac:
     description:
-    - NetworkId path parameter. Network ID.
+      - BluetoothMac query parameter. The MAC of a Bluetooth client.
     type: str
-  username:
+  email:
     description:
-    - Username query parameter. The username of a Systems Manager user.
+      - Email query parameter. The email of a network user account or a Systems Manager
+        device.
     type: str
-  email:
+  headers:
+    description: Additional headers.
+    type: dict
+  imei:
     description:
-    - Email query parameter. The email of a network user account or a Systems Manager device.
+      - Imei query parameter. The IMEI of a Systems Manager device.
     type: str
   mac:
     description:
-    - Mac query parameter. The MAC of a network client device or a Systems Manager device.
+      - Mac query parameter. The MAC of a network client device or a Systems Manager
+        device.
     type: str
-  serial:
+  networkId:
     description:
-    - Serial query parameter. The serial of a Systems Manager device.
+      - NetworkId path parameter. Network ID.
     type: str
-  imei:
+  serial:
     description:
-    - Imei query parameter. The IMEI of a Systems Manager device.
+      - Serial query parameter. The serial of a Systems Manager device.
     type: str
-  bluetoothMac:
+  username:
     description:
-    - BluetoothMac query parameter. The MAC of a Bluetooth client.
+      - Username query parameter. The username of a Systems Manager user.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkPiiSmDevicesForKey
-  description: Complete reference of the getNetworkPiiSmDevicesForKey API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-sm-devices-for-key
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_pii_sm_devices_for_key,
-
-  - Paths used are
-    get /networks/{networkId}/pii/smDevicesForKey,
+  - description: Complete reference of the getNetworkPiiSmDevicesForKey API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-sm-devices-for-key
+    name: Cisco Meraki documentation for networks getNetworkPiiSmDevicesForKey
+short_description: Information module for networks _pii _sm _devices _for _key
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _pii _sm _devices _for _key
   cisco.meraki.networks_pii_sm_devices_for_key_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     username: string
     email: string
     mac: string
@@ -96,7 +96,6 @@
     bluetoothMac: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_pii_sm_owners_for_key_info.py b/plugins/modules/networks_pii_sm_owners_for_key_info.py
index afec0837e..330a9e7f6 100644
--- a/plugins/modules/networks_pii_sm_owners_for_key_info.py
+++ b/plugins/modules/networks_pii_sm_owners_for_key_info.py
@@ -5,89 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_pii_sm_owners_for_key_info
-short_description: Information module for networks _pii _sm _owners _for _key
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _pii _sm _owners _for _key.
-- >
-   Given a piece of Personally Identifiable Information PII , return the Systems Manager owner IDs associated with
-   that identifier. These owner IDs can be used with the Systems Manager API endpoints to retrieve owner details.
-   Exactly one identifier will be accepted.
-version_added: '2.16.0'
+  - Get all networks _pii _sm _owners _for _key.
+  - 'Given a piece of Personally Identifiable Information PII , return the Systems
+    Manager owner IDs associated with that identifier. These owner IDs can be used
+    with the Systems Manager API endpoints to retrieve owner details. Exactly one
+    identifier will be accepted.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_pii_sm_owners_for_key_info
+notes:
+  - SDK Method used are networks.Networks.get_network_pii_sm_owners_for_key,
+  - Paths used are get /networks/{networkId}/pii/smOwnersForKey,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
+  bluetoothMac:
     description:
-    - NetworkId path parameter. Network ID.
+      - BluetoothMac query parameter. The MAC of a Bluetooth client.
     type: str
-  username:
+  email:
     description:
-    - Username query parameter. The username of a Systems Manager user.
+      - Email query parameter. The email of a network user account or a Systems Manager
+        device.
     type: str
-  email:
+  headers:
+    description: Additional headers.
+    type: dict
+  imei:
     description:
-    - Email query parameter. The email of a network user account or a Systems Manager device.
+      - Imei query parameter. The IMEI of a Systems Manager device.
     type: str
   mac:
     description:
-    - Mac query parameter. The MAC of a network client device or a Systems Manager device.
+      - Mac query parameter. The MAC of a network client device or a Systems Manager
+        device.
     type: str
-  serial:
+  networkId:
     description:
-    - Serial query parameter. The serial of a Systems Manager device.
+      - NetworkId path parameter. Network ID.
     type: str
-  imei:
+  serial:
     description:
-    - Imei query parameter. The IMEI of a Systems Manager device.
+      - Serial query parameter. The serial of a Systems Manager device.
     type: str
-  bluetoothMac:
+  username:
     description:
-    - BluetoothMac query parameter. The MAC of a Bluetooth client.
+      - Username query parameter. The username of a Systems Manager user.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkPiiSmOwnersForKey
-  description: Complete reference of the getNetworkPiiSmOwnersForKey API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-sm-owners-for-key
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_pii_sm_owners_for_key,
-
-  - Paths used are
-    get /networks/{networkId}/pii/smOwnersForKey,
+  - description: Complete reference of the getNetworkPiiSmOwnersForKey API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-pii-sm-owners-for-key
+    name: Cisco Meraki documentation for networks getNetworkPiiSmOwnersForKey
+short_description: Information module for networks _pii _sm _owners _for _key
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _pii _sm _owners _for _key
   cisco.meraki.networks_pii_sm_owners_for_key_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     username: string
     email: string
     mac: string
@@ -96,7 +96,6 @@
     bluetoothMac: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_policies_by_client_info.py b/plugins/modules/networks_policies_by_client_info.py
index 13fe0fae0..f4f6f15cc 100644
--- a/plugins/modules/networks_policies_by_client_info.py
+++ b/plugins/modules/networks_policies_by_client_info.py
@@ -5,92 +5,97 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_policies_by_client_info
-short_description: Information module for networks _policies _by _client
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _policies _by _client.
-- Get policies for all clients with policies.
-version_added: '2.16.0'
+  - Get all networks _policies _by _client.
+  - Get policies for all clients with policies.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_policies_by_client_info
+notes:
+  - SDK Method used are networks.Networks.get_network_policies_by_client,
+  - Paths used are get /networks/{networkId}/policies/byClient,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkPoliciesByClient
-  description: Complete reference of the getNetworkPoliciesByClient API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-policies-by-client
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_policies_by_client,
-
-  - Paths used are
-    get /networks/{networkId}/policies/byClient,
+  - description: Complete reference of the getNetworkPoliciesByClient API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-policies-by-client
+    name: Cisco Meraki documentation for networks getNetworkPoliciesByClient
+short_description: Information module for networks _policies _by _client
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _policies _by _client
   cisco.meraki.networks_policies_by_client_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -100,7 +105,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_publish.py b/plugins/modules/networks_publish.py
index 11f3e09e7..8083cf6f4 100644
--- a/plugins/modules/networks_publish.py
+++ b/plugins/modules/networks_publish.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_publish
-short_description: Resource module for networks _publish
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _publish.
-- Update the status of a finished auto locate job to be published, and update device locations.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _publish.
+  - Update the status of a finished auto locate job to be published, and update device
+    locations.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_publish
+notes:
+  - SDK Method used are networks.Networks.publish_network_floor_plans_auto_locate_job,
+  - Paths used are post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/publish,
 options:
   devices:
     description: The list of devices to publish positions for.
@@ -24,8 +25,8 @@
         description: The auto locate position for this device.
         suboptions:
           isAnchor:
-            description: Whether or not this device's location should be saved as a
-              user-defined anchor.
+            description: Whether or not this device's location should be saved as
+              a user-defined anchor.
             type: bool
         type: dict
       lat:
@@ -45,52 +46,47 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks publishNetworkFloorPlansAutoLocateJob
-  description: Complete reference of the publishNetworkFloorPlansAutoLocateJob API.
-  link: https://developer.cisco.com/meraki/api-v1/#!publish-network-floor-plans-auto-locate-job
-notes:
-  - SDK Method used are
-    networks.Networks.publish_network_floor_plans_auto_locate_job,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/publish,
+  - description: Complete reference of the publishNetworkFloorPlansAutoLocateJob API.
+    link: https://developer.cisco.com/meraki/api-v1/#!publish-network-floor-plans-auto-locate-job
+    name: Cisco Meraki documentation for networks publishNetworkFloorPlansAutoLocateJob
+short_description: Resource module for networks _publish
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_publish:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     devices:
-    - autoLocate:
-        isAnchor: true
-      lat: 37.4180951010362
-      lng: -122.098531723022
-      serial: Q234-ABCD-5678
+      - autoLocate:
+          isAnchor: true
+        lat: 37.4180951010362
+        lng: -122.098531723022
+        serial: Q234-ABCD-5678
     jobId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_recalculate.py b/plugins/modules/networks_recalculate.py
index 57876924c..1dbbecf07 100644
--- a/plugins/modules/networks_recalculate.py
+++ b/plugins/modules/networks_recalculate.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_recalculate
-short_description: Resource module for networks _recalculate
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _recalculate.
-- Trigger auto locate recalculation for a job, and optionally set anchors.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _recalculate.
+  - Trigger auto locate recalculation for a job, and optionally set anchors.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_recalculate
+notes:
+  - SDK Method used are networks.Networks.recalculate_network_floor_plans_auto_locate_job,
+  - Paths used are post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/recalculate,
 options:
   devices:
     description: The list of devices to update anchor positions for.
@@ -45,52 +45,48 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks recalculateNetworkFloorPlansAutoLocateJob
-  description: Complete reference of the recalculateNetworkFloorPlansAutoLocateJob API.
-  link: https://developer.cisco.com/meraki/api-v1/#!recalculate-network-floor-plans-auto-locate-job
-notes:
-  - SDK Method used are
-    networks.Networks.recalculate_network_floor_plans_auto_locate_job,
-
-  - Paths used are
-    post /networks/{networkId}/floorPlans/autoLocate/jobs/{jobId}/recalculate,
+  - description: Complete reference of the recalculateNetworkFloorPlansAutoLocateJob
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!recalculate-network-floor-plans-auto-locate-job
+    name: Cisco Meraki documentation for networks recalculateNetworkFloorPlansAutoLocateJob
+short_description: Resource module for networks _recalculate
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_recalculate:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     devices:
-    - autoLocate:
-        isAnchor: true
-        lat: 37.4180951010362
-        lng: -122.098531723022
-      serial: Q234-ABCD-5678
+      - autoLocate:
+          isAnchor: true
+          lat: 37.4180951010362
+          lng: -122.098531723022
+        serial: Q234-ABCD-5678
     jobId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_alerts_current_overview_by_metric_info.py b/plugins/modules/networks_sensor_alerts_current_overview_by_metric_info.py
index b6e79e4ac..0a534128a 100644
--- a/plugins/modules/networks_sensor_alerts_current_overview_by_metric_info.py
+++ b/plugins/modules/networks_sensor_alerts_current_overview_by_metric_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_alerts_current_overview_by_metric_info
-short_description: Information module for networks _sensor _alerts _current _overview _by _metric
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sensor _alerts _current _overview _by _metric.
-- Return an overview of currently alerting sensors by metric.
-version_added: '2.16.0'
+  - Get all networks _sensor _alerts _current _overview _by _metric.
+  - Return an overview of currently alerting sensors by metric.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_alerts_current_overview_by_metric_info
+notes:
+  - SDK Method used are sensor.Sensor.get_network_sensor_alerts_current_overview_by_metric,
+  - Paths used are get /networks/{networkId}/sensor/alerts/current/overview/byMetric,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getNetworkSensorAlertsCurrentOverviewByMetric
-  description: Complete reference of the getNetworkSensorAlertsCurrentOverviewByMetric API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-current-overview-by-metric
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_network_sensor_alerts_current_overview_by_metric,
-
-  - Paths used are
-    get /networks/{networkId}/sensor/alerts/current/overview/byMetric,
+  - description: Complete reference of the getNetworkSensorAlertsCurrentOverviewByMetric
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-current-overview-by-metric
+    name: Cisco Meraki documentation for sensor getNetworkSensorAlertsCurrentOverviewByMetric
+short_description: Information module for networks _sensor _alerts _current _overview
+  _by _metric
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sensor _alerts _current _overview _by _metric
   cisco.meraki.networks_sensor_alerts_current_overview_by_metric_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_alerts_overview_by_metric_info.py b/plugins/modules/networks_sensor_alerts_overview_by_metric_info.py
index ef8cc841a..f679ae3ef 100644
--- a/plugins/modules/networks_sensor_alerts_overview_by_metric_info.py
+++ b/plugins/modules/networks_sensor_alerts_overview_by_metric_info.py
@@ -5,90 +5,92 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_alerts_overview_by_metric_info
-short_description: Information module for networks _sensor _alerts _overview _by _metric
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sensor _alerts _overview _by _metric.
-- Return an overview of alert occurrences over a timespan, by metric.
-version_added: '2.16.0'
+  - Get all networks _sensor _alerts _overview _by _metric.
+  - Return an overview of alert occurrences over a timespan, by metric.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_alerts_overview_by_metric_info
+notes:
+  - SDK Method used are sensor.Sensor.get_network_sensor_alerts_overview_by_metric,
+  - Paths used are get /networks/{networkId}/sensor/alerts/overview/byMetric,
 options:
   headers:
     description: Additional headers.
     type: dict
+  interval:
+    description:
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 900, 3600, 86400, 604800, 2592000. The default is
+        604800. Interval is calculated if time params are provided.
+
+        '
+    type: int
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 731 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 731 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 366 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 366 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 366 days. The
-      default is 7 days. If interval is provided, the timespan will be autocalculated.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 366 days. The default
+        is 7 days. If interval is provided, the timespan will be autocalculated.
+
+        '
     type: float
-  interval:
-    description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 900, 3600,
-      86400, 604800, 2592000. The default is 604800. Interval is calculated if time params are provided.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getNetworkSensorAlertsOverviewByMetric
-  description: Complete reference of the getNetworkSensorAlertsOverviewByMetric API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-overview-by-metric
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_network_sensor_alerts_overview_by_metric,
-
-  - Paths used are
-    get /networks/{networkId}/sensor/alerts/overview/byMetric,
+  - description: Complete reference of the getNetworkSensorAlertsOverviewByMetric
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-overview-by-metric
+    name: Cisco Meraki documentation for sensor getNetworkSensorAlertsOverviewByMetric
+short_description: Information module for networks _sensor _alerts _overview _by _metric
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sensor _alerts _overview _by _metric
   cisco.meraki.networks_sensor_alerts_overview_by_metric_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     interval: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_alerts_profiles.py b/plugins/modules/networks_sensor_alerts_profiles.py
index 6830ec6ea..825eb1af2 100644
--- a/plugins/modules/networks_sensor_alerts_profiles.py
+++ b/plugins/modules/networks_sensor_alerts_profiles.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_alerts_profiles
-short_description: Resource module for networks _sensor _alerts _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _sensor _alerts _profiles.
-- Creates a sensor alert profile for a network.
-- Deletes a sensor alert profile from a network.
-- Updates a sensor alert profile for a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _sensor _alerts
+    _profiles.
+  - Creates a sensor alert profile for a network.
+  - Deletes a sensor alert profile from a network.
+  - Updates a sensor alert profile for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_alerts_profiles
+notes:
+  - SDK Method used are sensor.Sensor.create_network_sensor_alerts_profile, sensor.Sensor.delete_network_sensor_alerts_profile,
+    sensor.Sensor.update_network_sensor_alerts_profile,
+  - Paths used are post /networks/{networkId}/sensor/alerts/profiles, delete /networks/{networkId}/sensor/alerts/profiles/{id},
+    put /networks/{networkId}/sensor/alerts/profiles/{id},
 options:
   conditions:
     description: List of conditions that will cause the profile to send an alert.
@@ -38,8 +41,8 @@
         description: The type of sensor metric that will be monitored for changes.
         type: str
       threshold:
-        description: Threshold for sensor readings that will cause an alert to be sent.
-          This object should contain a single property key matching the condition's
+        description: Threshold for sensor readings that will cause an alert to be
+          sent. This object should contain a single property key matching the condition's
           'metric' value.
         suboptions:
           apparentPower:
@@ -72,8 +75,8 @@
             description: Door open threshold. 'open' must be provided and set to true.
             suboptions:
               open:
-                description: Alerting threshold for a door open event. Must be set to
-                  true.
+                description: Alerting threshold for a door open event. Must be set
+                  to true.
                 type: bool
             type: dict
           frequency:
@@ -110,20 +113,21 @@
             description: Noise threshold. 'ambient' must be provided.
             suboptions:
               ambient:
-                description: Ambient noise threshold. One of 'level' or 'quality' must
-                  be provided.
+                description: Ambient noise threshold. One of 'level' or 'quality'
+                  must be provided.
                 suboptions:
                   level:
                     description: Alerting threshold as adjusted decibels.
                     type: int
                   quality:
-                    description: Alerting threshold as a qualitative ambient noise level.
+                    description: Alerting threshold as a qualitative ambient noise
+                      level.
                     type: str
                 type: dict
             type: dict
           pm25:
-            description: PM2.5 concentration threshold. One of 'concentration' or 'quality'
-              must be provided.
+            description: PM2.5 concentration threshold. One of 'concentration' or
+              'quality' must be provided.
             suboptions:
               concentration:
                 description: Alerting threshold as PM2.5 parts per million.
@@ -148,8 +152,8 @@
                 type: float
             type: dict
           temperature:
-            description: Temperature threshold. One of 'celsius', 'fahrenheit', or 'quality'
-              must be provided.
+            description: Temperature threshold. One of 'celsius', 'fahrenheit', or
+              'quality' must be provided.
             suboptions:
               celsius:
                 description: Alerting threshold in degrees Celsius.
@@ -177,8 +181,8 @@
               and set to true.
             suboptions:
               outageDetected:
-                description: Alerting threshold for an upstream power event. Must be
-                  set to true.
+                description: Alerting threshold for an upstream power event. Must
+                  be set to true.
                 type: bool
             type: dict
           voltage:
@@ -189,12 +193,12 @@
                 type: float
             type: dict
           water:
-            description: Water detection threshold. 'present' must be provided and set
-              to true.
+            description: Water detection threshold. 'present' must be provided and
+              set to true.
             suboptions:
               present:
-                description: Alerting threshold for a water detection event. Must be
-                  set to true.
+                description: Alerting threshold for a water detection event. Must
+                  be set to true.
                 type: bool
             type: dict
         type: dict
@@ -216,12 +220,13 @@
         elements: str
         type: list
       httpServerIds:
-        description: A list of webhook endpoint IDs that will receive information about
-          the alert.
+        description: A list of webhook endpoint IDs that will receive information
+          about the alert.
         elements: str
         type: list
       smsNumbers:
-        description: A list of SMS numbers that will receive information about the alert.
+        description: A list of SMS numbers that will receive information about the
+          alert.
         elements: str
         type: list
     type: dict
@@ -238,228 +243,217 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor createNetworkSensorAlertsProfile
-  description: Complete reference of the createNetworkSensorAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-sensor-alerts-profile
-- name: Cisco Meraki documentation for sensor deleteNetworkSensorAlertsProfile
-  description: Complete reference of the deleteNetworkSensorAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sensor-alerts-profile
-- name: Cisco Meraki documentation for sensor updateNetworkSensorAlertsProfile
-  description: Complete reference of the updateNetworkSensorAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-sensor-alerts-profile
-notes:
-  - SDK Method used are
-    sensor.Sensor.create_network_sensor_alerts_profile,
-    sensor.Sensor.delete_network_sensor_alerts_profile,
-    sensor.Sensor.update_network_sensor_alerts_profile,
-
-  - Paths used are
-    post /networks/{networkId}/sensor/alerts/profiles,
-    delete /networks/{networkId}/sensor/alerts/profiles/{id},
-    put /networks/{networkId}/sensor/alerts/profiles/{id},
+  - description: Complete reference of the createNetworkSensorAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-sensor-alerts-profile
+    name: Cisco Meraki documentation for sensor createNetworkSensorAlertsProfile
+  - description: Complete reference of the deleteNetworkSensorAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sensor-alerts-profile
+    name: Cisco Meraki documentation for sensor deleteNetworkSensorAlertsProfile
+  - description: Complete reference of the updateNetworkSensorAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-sensor-alerts-profile
+    name: Cisco Meraki documentation for sensor updateNetworkSensorAlertsProfile
+short_description: Resource module for networks _sensor _alerts _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sensor_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     conditions:
-    - direction: above
-      duration: 60
-      metric: temperature
-      threshold:
-        apparentPower:
-          draw: 17.2
-        co2:
-          concentration: 400
-          quality: poor
-        current:
-          draw: 0.14
-        door:
-          open: true
-        frequency:
-          level: 58.8
-        humidity:
-          quality: inadequate
-          relativePercentage: 65
-        indoorAirQuality:
-          quality: fair
-          score: 80
-        noise:
-          ambient:
-            level: 120
+      - direction: above
+        duration: 60
+        metric: temperature
+        threshold:
+          apparentPower:
+            draw: 17.2
+          co2:
+            concentration: 400
+            quality: poor
+          current:
+            draw: 0.14
+          door:
+            open: true
+          frequency:
+            level: 58.8
+          humidity:
+            quality: inadequate
+            relativePercentage: 65
+          indoorAirQuality:
+            quality: fair
+            score: 80
+          noise:
+            ambient:
+              level: 120
+              quality: poor
+          pm25:
+            concentration: 90
+            quality: fair
+          powerFactor:
+            percentage: 81
+          realPower:
+            draw: 14.1
+          temperature:
+            celsius: 20.5
+            fahrenheit: 70.0
+            quality: good
+          tvoc:
+            concentration: 400
             quality: poor
-        pm25:
-          concentration: 90
-          quality: fair
-        powerFactor:
-          percentage: 81
-        realPower:
-          draw: 14.1
-        temperature:
-          celsius: 20.5
-          fahrenheit: 70.0
-          quality: good
-        tvoc:
-          concentration: 400
-          quality: poor
-        upstreamPower:
-          outageDetected: true
-        voltage:
-          level: 119.5
-        water:
-          present: true
+          upstreamPower:
+            outageDetected: true
+          voltage:
+            level: 119.5
+          water:
+            present: true
     name: My Sensor Alert Profile
     networkId: string
     recipients:
       emails:
-      - miles@meraki.com
+        - miles@meraki.com
       httpServerIds:
-      - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
+        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
       smsNumbers:
-      - '+15555555555'
+        - '+15555555555'
     schedule:
       id: '5'
     serials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 - name: Delete by id
   cisco.meraki.networks_sensor_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     id: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_sensor_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     conditions:
-    - direction: above
-      duration: 60
-      metric: temperature
-      threshold:
-        apparentPower:
-          draw: 17.2
-        co2:
-          concentration: 400
-          quality: poor
-        current:
-          draw: 0.14
-        door:
-          open: true
-        frequency:
-          level: 58.8
-        humidity:
-          quality: inadequate
-          relativePercentage: 65
-        indoorAirQuality:
-          quality: fair
-          score: 80
-        noise:
-          ambient:
-            level: 120
+      - direction: above
+        duration: 60
+        metric: temperature
+        threshold:
+          apparentPower:
+            draw: 17.2
+          co2:
+            concentration: 400
             quality: poor
-        pm25:
-          concentration: 90
-          quality: fair
-        powerFactor:
-          percentage: 81
-        realPower:
-          draw: 14.1
-        temperature:
-          celsius: 20.5
-          fahrenheit: 70.0
-          quality: good
-        tvoc:
-          concentration: 400
-          quality: poor
-        upstreamPower:
-          outageDetected: true
-        voltage:
-          level: 119.5
-        water:
-          present: true
+          current:
+            draw: 0.14
+          door:
+            open: true
+          frequency:
+            level: 58.8
+          humidity:
+            quality: inadequate
+            relativePercentage: 65
+          indoorAirQuality:
+            quality: fair
+            score: 80
+          noise:
+            ambient:
+              level: 120
+              quality: poor
+          pm25:
+            concentration: 90
+            quality: fair
+          powerFactor:
+            percentage: 81
+          realPower:
+            draw: 14.1
+          temperature:
+            celsius: 20.5
+            fahrenheit: 70.0
+            quality: good
+          tvoc:
+            concentration: 400
+            quality: poor
+          upstreamPower:
+            outageDetected: true
+          voltage:
+            level: 119.5
+          water:
+            present: true
     id: string
     name: My Sensor Alert Profile
     networkId: string
     recipients:
       emails:
-      - miles@meraki.com
+        - miles@meraki.com
       httpServerIds:
-      - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
+        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
       smsNumbers:
-      - '+15555555555'
+        - '+15555555555'
     schedule:
       id: '5'
     serials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_alerts_profiles_info.py b/plugins/modules/networks_sensor_alerts_profiles_info.py
index 7fb6a2b55..5dd03e446 100644
--- a/plugins/modules/networks_sensor_alerts_profiles_info.py
+++ b/plugins/modules/networks_sensor_alerts_profiles_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_alerts_profiles_info
-short_description: Information module for networks _sensor _alerts _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sensor _alerts _profiles.
-- Get networks _sensor _alerts _profiles by id.
-- Lists all sensor alert profiles for a network.
-- Show details of a sensor alert profile for a network.
-version_added: '2.16.0'
+  - Get all networks _sensor _alerts _profiles.
+  - Get networks _sensor _alerts _profiles by id.
+  - Lists all sensor alert profiles for a network.
+  - Show details of a sensor alert profile for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_alerts_profiles_info
+notes:
+  - SDK Method used are sensor.Sensor.get_network_sensor_alerts_profile, sensor.Sensor.get_network_sensor_alerts_profiles,
+  - Paths used are get /networks/{networkId}/sensor/alerts/profiles, get /networks/{networkId}/sensor/alerts/profiles/{id},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  id:
     description:
-    - NetworkId path parameter. Network ID.
+      - Id path parameter.
     type: str
-  id:
+  networkId:
     description:
-    - Id path parameter.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getNetworkSensorAlertsProfile
-  description: Complete reference of the getNetworkSensorAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-profile
-- name: Cisco Meraki documentation for sensor getNetworkSensorAlertsProfiles
-  description: Complete reference of the getNetworkSensorAlertsProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-profiles
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_network_sensor_alerts_profile,
-    sensor.Sensor.get_network_sensor_alerts_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/sensor/alerts/profiles,
-    get /networks/{networkId}/sensor/alerts/profiles/{id},
+  - description: Complete reference of the getNetworkSensorAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-profile
+    name: Cisco Meraki documentation for sensor getNetworkSensorAlertsProfile
+  - description: Complete reference of the getNetworkSensorAlertsProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-alerts-profiles
+    name: Cisco Meraki documentation for sensor getNetworkSensorAlertsProfiles
+short_description: Information module for networks _sensor _alerts _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sensor _alerts _profiles
   cisco.meraki.networks_sensor_alerts_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _sensor _alerts _profiles by id
   cisco.meraki.networks_sensor_alerts_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     id: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_mqtt_brokers.py b/plugins/modules/networks_sensor_mqtt_brokers.py
index 520900180..f10216699 100644
--- a/plugins/modules/networks_sensor_mqtt_brokers.py
+++ b/plugins/modules/networks_sensor_mqtt_brokers.py
@@ -5,18 +5,19 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_mqtt_brokers
-short_description: Resource module for networks _sensor _mqtt _brokers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _sensor _mqtt _brokers.
-- >
-   Update the sensor settings of an MQTT broker. To update the broker itself, use
-   /networks/{networkId}/mqttBrokers/{mqttBrokerId}.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _sensor _mqtt _brokers.
+  - 'Update the sensor settings of an MQTT broker. To update the broker itself, use
+    /networks/{networkId}/mqttBrokers/{mqttBrokerId}.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_mqtt_brokers
+notes:
+  - SDK Method used are sensor.Sensor.update_network_sensor_mqtt_broker,
+  - Paths used are put /networks/{networkId}/sensor/mqttBrokers/{mqttBrokerId},
 options:
   enabled:
     description: Set to true to enable MQTT broker for sensor network.
@@ -28,48 +29,43 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor updateNetworkSensorMqttBroker
-  description: Complete reference of the updateNetworkSensorMqttBroker API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-sensor-mqtt-broker
-notes:
-  - SDK Method used are
-    sensor.Sensor.update_network_sensor_mqtt_broker,
-
-  - Paths used are
-    put /networks/{networkId}/sensor/mqttBrokers/{mqttBrokerId},
+  - description: Complete reference of the updateNetworkSensorMqttBroker API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-sensor-mqtt-broker
+    name: Cisco Meraki documentation for sensor updateNetworkSensorMqttBroker
+short_description: Resource module for networks _sensor _mqtt _brokers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_sensor_mqtt_brokers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     mqttBrokerId: '1234'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_mqtt_brokers_info.py b/plugins/modules/networks_sensor_mqtt_brokers_info.py
index f8fe2c68f..cfa974af8 100644
--- a/plugins/modules/networks_sensor_mqtt_brokers_info.py
+++ b/plugins/modules/networks_sensor_mqtt_brokers_info.py
@@ -5,106 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_mqtt_brokers_info
-short_description: Information module for networks _sensor _mqtt _brokers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sensor _mqtt _brokers.
-- Get networks _sensor _mqtt _brokers by id.
-- >
-   List the sensor settings of all MQTT brokers for this network. To get the brokers themselves, use
-   /networks/{networkId}/mqttBrokers.
-- >
-   Return the sensor settings of an MQTT broker. To get the broker itself, use
-   /networks/{networkId}/mqttBrokers/{mqttBrokerId}.
-version_added: '2.16.0'
+  - Get all networks _sensor _mqtt _brokers.
+  - Get networks _sensor _mqtt _brokers by id.
+  - 'List the sensor settings of all MQTT brokers for this network. To get the brokers
+    themselves, use /networks/{networkId}/mqttBrokers.
+
+    '
+  - 'Return the sensor settings of an MQTT broker. To get the broker itself, use /networks/{networkId}/mqttBrokers/{mqttBrokerId}.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_mqtt_brokers_info
+notes:
+  - SDK Method used are sensor.Sensor.get_network_sensor_mqtt_broker, sensor.Sensor.get_network_sensor_mqtt_brokers,
+  - Paths used are get /networks/{networkId}/sensor/mqttBrokers, get /networks/{networkId}/sensor/mqttBrokers/{mqttBrokerId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  mqttBrokerId:
     description:
-    - NetworkId path parameter. Network ID.
+      - MqttBrokerId path parameter. Mqtt broker ID.
     type: str
-  mqttBrokerId:
+  networkId:
     description:
-    - MqttBrokerId path parameter. Mqtt broker ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getNetworkSensorMqttBroker
-  description: Complete reference of the getNetworkSensorMqttBroker API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-mqtt-broker
-- name: Cisco Meraki documentation for sensor getNetworkSensorMqttBrokers
-  description: Complete reference of the getNetworkSensorMqttBrokers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-mqtt-brokers
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_network_sensor_mqtt_broker,
-    sensor.Sensor.get_network_sensor_mqtt_brokers,
-
-  - Paths used are
-    get /networks/{networkId}/sensor/mqttBrokers,
-    get /networks/{networkId}/sensor/mqttBrokers/{mqttBrokerId},
+  - description: Complete reference of the getNetworkSensorMqttBroker API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-mqtt-broker
+    name: Cisco Meraki documentation for sensor getNetworkSensorMqttBroker
+  - description: Complete reference of the getNetworkSensorMqttBrokers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-mqtt-brokers
+    name: Cisco Meraki documentation for sensor getNetworkSensorMqttBrokers
+short_description: Information module for networks _sensor _mqtt _brokers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sensor _mqtt _brokers
   cisco.meraki.networks_sensor_mqtt_brokers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _sensor _mqtt _brokers by id
   cisco.meraki.networks_sensor_mqtt_brokers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     mqttBrokerId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sensor_relationships_info.py b/plugins/modules/networks_sensor_relationships_info.py
index f976325ff..ac7381246 100644
--- a/plugins/modules/networks_sensor_relationships_info.py
+++ b/plugins/modules/networks_sensor_relationships_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sensor_relationships_info
-short_description: Information module for networks _sensor _relationships
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sensor _relationships.
-- List the sensor roles for devices in a given network.
-version_added: '2.16.0'
+  - Get all networks _sensor _relationships.
+  - List the sensor roles for devices in a given network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sensor_relationships_info
+notes:
+  - SDK Method used are sensor.Sensor.get_network_sensor_relationships,
+  - Paths used are get /networks/{networkId}/sensor/relationships,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getNetworkSensorRelationships
-  description: Complete reference of the getNetworkSensorRelationships API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-relationships
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_network_sensor_relationships,
-
-  - Paths used are
-    get /networks/{networkId}/sensor/relationships,
+  - description: Complete reference of the getNetworkSensorRelationships API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sensor-relationships
+    name: Cisco Meraki documentation for sensor getNetworkSensorRelationships
+short_description: Information module for networks _sensor _relationships
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sensor _relationships
   cisco.meraki.networks_sensor_relationships_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_settings.py b/plugins/modules/networks_settings.py
index a6529b36f..78e0b0ec2 100644
--- a/plugins/modules/networks_settings.py
+++ b/plugins/modules/networks_settings.py
@@ -5,20 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_settings
-short_description: Resource module for networks _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _settings.
-- Update the settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _settings.
+  - Update the settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_settings
+notes:
+  - SDK Method used are networks.Networks.update_network_settings,
+  - Paths used are put /networks/{networkId}/settings,
 options:
   localStatusPage:
-    description: A hash of Local Status page(s)' authentication options applied to the
-      Network.
+    description: A hash of Local Status page(s)' authentication options applied to
+      the Network.
     suboptions:
       authentication:
         description: A hash of Local Status page(s)' authentication options applied
@@ -52,8 +52,8 @@
     type: str
   remoteStatusPageEnabled:
     description: Enables / disables access to the device status page (<a target='_blank'>http
-      //device's LAN IP)</a>. Optional. Can only be set if localStatusPageEnabled is
-      set to true.
+      //device's LAN IP)</a>. Optional. Can only be set if localStatusPageEnabled
+      is set to true.
     type: bool
   securePort:
     description: A hash of SecureConnect options applied to the Network.
@@ -63,43 +63,39 @@
         type: bool
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkSettings
-  description: Complete reference of the updateNetworkSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-settings
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_settings,
-
-  - Paths used are
-    put /networks/{networkId}/settings,
+  - description: Complete reference of the updateNetworkSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-settings
+    name: Cisco Meraki documentation for networks updateNetworkSettings
+short_description: Resource module for networks _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     localStatusPage:
       authentication:
@@ -112,7 +108,6 @@
     remoteStatusPageEnabled: true
     securePort:
       enabled: false
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_settings_info.py b/plugins/modules/networks_settings_info.py
index b42f23284..636aca0d5 100644
--- a/plugins/modules/networks_settings_info.py
+++ b/plugins/modules/networks_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_settings_info
-short_description: Information module for networks _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _settings.
-- Return the settings for a network.
-version_added: '2.16.0'
+  - Get all networks _settings.
+  - Return the settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_settings_info
+notes:
+  - SDK Method used are networks.Networks.get_network_settings,
+  - Paths used are get /networks/{networkId}/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkSettings
-  description: Complete reference of the getNetworkSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-settings
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_settings,
-
-  - Paths used are
-    get /networks/{networkId}/settings,
+  - description: Complete reference of the getNetworkSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-settings
+    name: Cisco Meraki documentation for networks getNetworkSettings
+short_description: Information module for networks _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _settings
   cisco.meraki.networks_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_bypass_activation_lock_attempts.py b/plugins/modules/networks_sm_bypass_activation_lock_attempts.py
index 825dbb4df..81c2c1ba9 100644
--- a/plugins/modules/networks_sm_bypass_activation_lock_attempts.py
+++ b/plugins/modules/networks_sm_bypass_activation_lock_attempts.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_bypass_activation_lock_attempts
-short_description: Resource module for networks _sm _bypass _activation _lock _attempts
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _bypass _activation _lock _attempts.
-- Bypass activation lock attempt.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _bypass _activation _lock
+    _attempts.
+  - Bypass activation lock attempt.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_bypass_activation_lock_attempts
+notes:
+  - SDK Method used are sm.Sm.create_network_sm_bypass_activation_lock_attempt,
+  - Paths used are post /networks/{networkId}/sm/bypassActivationLockAttempts,
 options:
   ids:
     description: The ids of the devices to attempt activation lock bypass.
@@ -24,49 +25,45 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm createNetworkSmBypassActivationLockAttempt
-  description: Complete reference of the createNetworkSmBypassActivationLockAttempt API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-sm-bypass-activation-lock-attempt
-notes:
-  - SDK Method used are
-    sm.Sm.create_network_sm_bypass_activation_lock_attempt,
-
-  - Paths used are
-    post /networks/{networkId}/sm/bypassActivationLockAttempts,
+  - description: Complete reference of the createNetworkSmBypassActivationLockAttempt
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-sm-bypass-activation-lock-attempt
+    name: Cisco Meraki documentation for sm createNetworkSmBypassActivationLockAttempt
+short_description: Resource module for networks _sm _bypass _activation _lock _attempts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_bypass_activation_lock_attempts:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_bypass_activation_lock_attempts_info.py b/plugins/modules/networks_sm_bypass_activation_lock_attempts_info.py
index 3ac5f669e..34839adfb 100644
--- a/plugins/modules/networks_sm_bypass_activation_lock_attempts_info.py
+++ b/plugins/modules/networks_sm_bypass_activation_lock_attempts_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_bypass_activation_lock_attempts_info
-short_description: Information module for networks _sm _bypass _activation _lock _attempts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get networks _sm _bypass _activation _lock _attempts by id.
-- Bypass activation lock attempt status.
-version_added: '2.16.0'
+  - Get networks _sm _bypass _activation _lock _attempts by id.
+  - Bypass activation lock attempt status.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_bypass_activation_lock_attempts_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_bypass_activation_lock_attempt,
+  - Paths used are get /networks/{networkId}/sm/bypassActivationLockAttempts/{attemptId},
 options:
+  attemptId:
+    description:
+      - AttemptId path parameter. Attempt ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  attemptId:
-    description:
-    - AttemptId path parameter. Attempt ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmBypassActivationLockAttempt
-  description: Complete reference of the getNetworkSmBypassActivationLockAttempt API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-bypass-activation-lock-attempt
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_bypass_activation_lock_attempt,
-
-  - Paths used are
-    get /networks/{networkId}/sm/bypassActivationLockAttempts/{attemptId},
+  - description: Complete reference of the getNetworkSmBypassActivationLockAttempt
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-bypass-activation-lock-attempt
+    name: Cisco Meraki documentation for sm getNetworkSmBypassActivationLockAttempt
+short_description: Information module for networks _sm _bypass _activation _lock _attempts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get networks _sm _bypass _activation _lock _attempts by id
   cisco.meraki.networks_sm_bypass_activation_lock_attempts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     attemptId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_cellular_usage_history_info.py b/plugins/modules/networks_sm_devices_cellular_usage_history_info.py
index 947640699..f872eb177 100644
--- a/plugins/modules/networks_sm_devices_cellular_usage_history_info.py
+++ b/plugins/modules/networks_sm_devices_cellular_usage_history_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_cellular_usage_history_info
-short_description: Information module for networks _sm _devices _cellular _usage _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _cellular _usage _history.
-- Return the client's daily cellular data usage history. Usage data is in kilobytes.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _cellular _usage _history.
+  - Return the client's daily cellular data usage history. Usage data is in kilobytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_cellular_usage_history_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_cellular_usage_history,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/cellularUsageHistory,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceCellularUsageHistory
-  description: Complete reference of the getNetworkSmDeviceCellularUsageHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-cellular-usage-history
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_cellular_usage_history,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/cellularUsageHistory,
+  - description: Complete reference of the getNetworkSmDeviceCellularUsageHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-cellular-usage-history
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceCellularUsageHistory
+short_description: Information module for networks _sm _devices _cellular _usage _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _cellular _usage _history
   cisco.meraki.networks_sm_devices_cellular_usage_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_certs_info.py b/plugins/modules/networks_sm_devices_certs_info.py
index fb367f2e0..a4b201234 100644
--- a/plugins/modules/networks_sm_devices_certs_info.py
+++ b/plugins/modules/networks_sm_devices_certs_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_certs_info
-short_description: Information module for networks _sm _devices _certs
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _certs.
-- List the certs on a device.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _certs.
+  - List the certs on a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_certs_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_certs,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/certs,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceCerts
-  description: Complete reference of the getNetworkSmDeviceCerts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-certs
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_certs,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/certs,
+  - description: Complete reference of the getNetworkSmDeviceCerts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-certs
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceCerts
+short_description: Information module for networks _sm _devices _certs
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _certs
   cisco.meraki.networks_sm_devices_certs_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_checkin.py b/plugins/modules/networks_sm_devices_checkin.py
index cd679eb9e..60fde1550 100644
--- a/plugins/modules/networks_sm_devices_checkin.py
+++ b/plugins/modules/networks_sm_devices_checkin.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_checkin
-short_description: Resource module for networks _sm _devices _checkin
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _checkin.
-- Force check-in a set of devices.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _checkin.
+  - Force check-in a set of devices.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_checkin
+notes:
+  - SDK Method used are sm.Sm.checkin_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/checkin,
 options:
   ids:
     description: The ids of the devices to be checked-in.
@@ -37,58 +37,53 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm checkinNetworkSmDevices
-  description: Complete reference of the checkinNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!checkin-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.checkin_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/checkin,
+  - description: Complete reference of the checkinNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!checkin-network-sm-devices
+    name: Cisco Meraki documentation for sm checkinNetworkSmDevices
+short_description: Resource module for networks _sm _devices _checkin
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_checkin:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
     scope:
-    - withAny
-    - tag1
-    - tag2
+      - withAny
+      - tag1
+      - tag2
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_connectivity_info.py b/plugins/modules/networks_sm_devices_connectivity_info.py
index 94462c559..7b2215ad9 100644
--- a/plugins/modules/networks_sm_devices_connectivity_info.py
+++ b/plugins/modules/networks_sm_devices_connectivity_info.py
@@ -5,85 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_connectivity_info
-short_description: Information module for networks _sm _devices _connectivity
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _connectivity.
-- Returns historical connectivity data whether a device is regularly checking in to Dashboard .
-version_added: '2.16.0'
+  - Get all networks _sm _devices _connectivity.
+  - Returns historical connectivity data whether a device is regularly checking in
+    to Dashboard .
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_connectivity_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_connectivity,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/connectivity,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceConnectivity
-  description: Complete reference of the getNetworkSmDeviceConnectivity API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-connectivity
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_connectivity,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/connectivity,
+  - description: Complete reference of the getNetworkSmDeviceConnectivity API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-connectivity
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceConnectivity
+short_description: Information module for networks _sm _devices _connectivity
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _connectivity
   cisco.meraki.networks_sm_devices_connectivity_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -92,7 +96,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_desktop_logs_info.py b/plugins/modules/networks_sm_devices_desktop_logs_info.py
index 4054b82a8..808464409 100644
--- a/plugins/modules/networks_sm_devices_desktop_logs_info.py
+++ b/plugins/modules/networks_sm_devices_desktop_logs_info.py
@@ -5,85 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_desktop_logs_info
-short_description: Information module for networks _sm _devices _desktop _logs
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _desktop _logs.
-- Return historical records of various Systems Manager network connection details for desktop devices.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _desktop _logs.
+  - Return historical records of various Systems Manager network connection details
+    for desktop devices.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_desktop_logs_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_desktop_logs,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/desktopLogs,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceDesktopLogs
-  description: Complete reference of the getNetworkSmDeviceDesktopLogs API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-desktop-logs
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_desktop_logs,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/desktopLogs,
+  - description: Complete reference of the getNetworkSmDeviceDesktopLogs API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-desktop-logs
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceDesktopLogs
+short_description: Information module for networks _sm _devices _desktop _logs
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _desktop _logs
   cisco.meraki.networks_sm_devices_desktop_logs_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -92,7 +96,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_device_command_logs_info.py b/plugins/modules/networks_sm_devices_device_command_logs_info.py
index 24d7525d7..8e4090909 100644
--- a/plugins/modules/networks_sm_devices_device_command_logs_info.py
+++ b/plugins/modules/networks_sm_devices_device_command_logs_info.py
@@ -5,88 +5,93 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_device_command_logs_info
-short_description: Information module for networks _sm _devices _device _command _logs
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _device _command _logs.
-- >
-   Return historical records of commands sent to Systems Manager devices. Note that this will include the name of the
-   Dashboard user who initiated the command if it was generated by a Dashboard admin rather than the automatic
-   behavior of the system; you may wish to filter this out of any reports.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _device _command _logs.
+  - 'Return historical records of commands sent to Systems Manager devices. Note that
+    this will include the name of the Dashboard user who initiated the command if
+    it was generated by a Dashboard admin rather than the automatic behavior of the
+    system; you may wish to filter this out of any reports.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_device_command_logs_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_device_command_logs,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/deviceCommandLogs,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceDeviceCommandLogs
-  description: Complete reference of the getNetworkSmDeviceDeviceCommandLogs API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-device-command-logs
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_device_command_logs,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/deviceCommandLogs,
+  - description: Complete reference of the getNetworkSmDeviceDeviceCommandLogs API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-device-command-logs
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceDeviceCommandLogs
+short_description: Information module for networks _sm _devices _device _command _logs
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _device _command _logs
   cisco.meraki.networks_sm_devices_device_command_logs_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -95,7 +100,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_device_profiles_info.py b/plugins/modules/networks_sm_devices_device_profiles_info.py
index 6aec2262e..b9638798a 100644
--- a/plugins/modules/networks_sm_devices_device_profiles_info.py
+++ b/plugins/modules/networks_sm_devices_device_profiles_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_device_profiles_info
-short_description: Information module for networks _sm _devices _device _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _device _profiles.
-- Get the installed profiles associated with a device.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _device _profiles.
+  - Get the installed profiles associated with a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_device_profiles_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_device_profiles,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/deviceProfiles,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceDeviceProfiles
-  description: Complete reference of the getNetworkSmDeviceDeviceProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-device-profiles
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_device_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/deviceProfiles,
+  - description: Complete reference of the getNetworkSmDeviceDeviceProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-device-profiles
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceDeviceProfiles
+short_description: Information module for networks _sm _devices _device _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _device _profiles
   cisco.meraki.networks_sm_devices_device_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_fields.py b/plugins/modules/networks_sm_devices_fields.py
index 5560a6e52..78b887b01 100644
--- a/plugins/modules/networks_sm_devices_fields.py
+++ b/plugins/modules/networks_sm_devices_fields.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_fields
-short_description: Resource module for networks _sm _devices _fields
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _sm _devices _fields.
-- Modify the fields of a device.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _sm _devices _fields.
+  - Modify the fields of a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_fields
+notes:
+  - SDK Method used are sm.Sm.update_network_sm_devices_fields,
+  - Paths used are put /networks/{networkId}/sm/devices/fields,
 options:
   deviceFields:
     description: The new fields of the device. Each field of this object is optional.
@@ -39,43 +39,39 @@
     description: The wifiMac of the device to be modified.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm updateNetworkSmDevicesFields
-  description: Complete reference of the updateNetworkSmDevicesFields API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-sm-devices-fields
-notes:
-  - SDK Method used are
-    sm.Sm.update_network_sm_devices_fields,
-
-  - Paths used are
-    put /networks/{networkId}/sm/devices/fields,
+  - description: Complete reference of the updateNetworkSmDevicesFields API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-sm-devices-fields
+    name: Cisco Meraki documentation for sm updateNetworkSmDevicesFields
+short_description: Resource module for networks _sm _devices _fields
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_sm_devices_fields:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     deviceFields:
       name: Miles's phone
       notes: Here's some info about my device
@@ -83,7 +79,6 @@
     networkId: string
     serial: XY0XX0Y0X0
     wifiMac: 00:11:22:33:44:55
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_info.py b/plugins/modules/networks_sm_devices_info.py
index 7826fa7c8..a1b4060f1 100644
--- a/plugins/modules/networks_sm_devices_info.py
+++ b/plugins/modules/networks_sm_devices_info.py
@@ -5,127 +5,134 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_info
-short_description: Information module for networks _sm _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices.
-- List the devices enrolled in an SM network with various specified fields and filters.
-version_added: '2.16.0'
+  - Get all networks _sm _devices.
+  - List the devices enrolled in an SM network with various specified fields and filters.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_devices,
+  - Paths used are get /networks/{networkId}/sm/devices,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
+  endingBefore:
     description:
-    - NetworkId path parameter. Network ID.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   fields:
     description:
-    - >
-      Fields query parameter. Additional fields that will be displayed for each device. The default fields are id,
-      name, tags, ssid, wifiMac, osName, systemModel, uuid, and serialNumber. The additional fields are ip,
-      systemType, availableDeviceCapacity, kioskAppName, biosVersion, lastConnected, missingAppsCount,
-      userSuppliedAddress, location, lastUser, ownerEmail, ownerUsername, osBuild, publicIp, phoneNumber,
-      diskInfoJson, deviceCapacity, isManaged, hadMdm, isSupervised, meid, imei, iccid, simCarrierNetwork,
-      cellularDataUsed, isHotspotEnabled, createdAt, batteryEstCharge, quarantined, avName, avRunning, asName,
-      fwName, isRooted, loginRequired, screenLockEnabled, screenLockDelay, autoLoginDisabled, autoTags, hasMdm,
-      hasDesktopAgent, diskEncryptionEnabled, hardwareEncryptionCaps, passCodeLock, usesHardwareKeystore,
-      androidSecurityPatchVersion, cellular, and url.
+      - 'Fields query parameter. Additional fields that will be displayed for each
+        device. The default fields are id, name, tags, ssid, wifiMac, osName, systemModel,
+        uuid, and serialNumber. The additional fields are ip, systemType, availableDeviceCapacity,
+        kioskAppName, biosVersion, lastConnected, missingAppsCount, userSuppliedAddress,
+        location, lastUser, ownerEmail, ownerUsername, osBuild, publicIp, phoneNumber,
+        diskInfoJson, deviceCapacity, isManaged, hadMdm, isSupervised, meid, imei,
+        iccid, simCarrierNetwork, cellularDataUsed, isHotspotEnabled, createdAt, batteryEstCharge,
+        quarantined, avName, avRunning, asName, fwName, isRooted, loginRequired, screenLockEnabled,
+        screenLockDelay, autoLoginDisabled, autoTags, hasMdm, hasDesktopAgent, diskEncryptionEnabled,
+        hardwareEncryptionCaps, passCodeLock, usesHardwareKeystore, androidSecurityPatchVersion,
+        cellular, and url.
+
+        '
     elements: str
     type: list
-  wifiMacs:
+  headers:
+    description: Additional headers.
+    type: dict
+  ids:
     description:
-    - WifiMacs query parameter. Filter devices by wifi mac(s).
+      - Ids query parameter. Filter devices by id(s).
     elements: str
     type: list
-  serials:
+  networkId:
     description:
-    - Serials query parameter. Filter devices by serial(s).
-    elements: str
-    type: list
-  ids:
+      - NetworkId path parameter. Network ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  scope:
     description:
-    - Ids query parameter. Filter devices by id(s).
+      - 'Scope query parameter. Specify a scope (one of all, none, withAny, withAll,
+        withoutAny, or withoutAll) and a set of tags.
+
+        '
     elements: str
     type: list
-  uuids:
+  serials:
     description:
-    - Uuids query parameter. Filter devices by uuid(s).
+      - Serials query parameter. Filter devices by serial(s).
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   systemTypes:
     description:
-    - SystemTypes query parameter. Filter devices by system type(s).
+      - SystemTypes query parameter. Filter devices by system type(s).
     elements: str
     type: list
-  scope:
+  uuids:
     description:
-    - >
-      Scope query parameter. Specify a scope (one of all, none, withAny, withAll, withoutAny, or withoutAll) and a
-      set of tags.
+      - Uuids query parameter. Filter devices by uuid(s).
     elements: str
     type: list
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+  wifiMacs:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
+      - WifiMacs query parameter. Filter devices by wifi mac(s).
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDevices
-  description: Complete reference of the getNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_devices,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices,
+  - description: Complete reference of the getNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-devices
+    name: Cisco Meraki documentation for sm getNetworkSmDevices
+short_description: Information module for networks _sm _devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices
   cisco.meraki.networks_sm_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     fields: []
     wifiMacs: []
     serials: []
@@ -140,7 +147,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_install_apps.py b/plugins/modules/networks_sm_devices_install_apps.py
index 9b5ed92cf..7c8609f66 100644
--- a/plugins/modules/networks_sm_devices_install_apps.py
+++ b/plugins/modules/networks_sm_devices_install_apps.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_install_apps
-short_description: Resource module for networks _sm _devices _install _apps
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _install _apps.
-- Install applications on a device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _install _apps.
+  - Install applications on a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_install_apps
+notes:
+  - SDK Method used are sm.Sm.install_network_sm_device_apps,
+  - Paths used are post /networks/{networkId}/sm/devices/{deviceId}/installApps,
 options:
   appIds:
     description: Ids of applications to be installed.
@@ -32,50 +32,45 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm installNetworkSmDeviceApps
-  description: Complete reference of the installNetworkSmDeviceApps API.
-  link: https://developer.cisco.com/meraki/api-v1/#!install-network-sm-device-apps
-notes:
-  - SDK Method used are
-    sm.Sm.install_network_sm_device_apps,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/{deviceId}/installApps,
+  - description: Complete reference of the installNetworkSmDeviceApps API.
+    link: https://developer.cisco.com/meraki/api-v1/#!install-network-sm-device-apps
+    name: Cisco Meraki documentation for sm installNetworkSmDeviceApps
+short_description: Resource module for networks _sm _devices _install _apps
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_install_apps:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     appIds:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     deviceId: string
     force: false
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_lock.py b/plugins/modules/networks_sm_devices_lock.py
index e55489942..240768e71 100644
--- a/plugins/modules/networks_sm_devices_lock.py
+++ b/plugins/modules/networks_sm_devices_lock.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_lock
-short_description: Resource module for networks _sm _devices _lock
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _lock.
-- Lock a set of devices.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _lock.
+  - Lock a set of devices.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_lock
+notes:
+  - SDK Method used are sm.Sm.lock_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/lock,
 options:
   ids:
     description: The ids of the devices to be locked.
@@ -41,59 +41,54 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm lockNetworkSmDevices
-  description: Complete reference of the lockNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!lock-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.lock_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/lock,
+  - description: Complete reference of the lockNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!lock-network-sm-devices
+    name: Cisco Meraki documentation for sm lockNetworkSmDevices
+short_description: Resource module for networks _sm _devices _lock
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_lock:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
     pin: 123456
     scope:
-    - withAny
-    - tag1
-    - tag2
+      - withAny
+      - tag1
+      - tag2
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_modify_tags.py b/plugins/modules/networks_sm_devices_modify_tags.py
index 1776d7e57..2069f5f22 100644
--- a/plugins/modules/networks_sm_devices_modify_tags.py
+++ b/plugins/modules/networks_sm_devices_modify_tags.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_modify_tags
-short_description: Resource module for networks _sm _devices _modify _tags
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _modify _tags.
-- Add, delete, or update the tags of a set of devices.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _modify _tags.
+  - Add, delete, or update the tags of a set of devices.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_modify_tags
+notes:
+  - SDK Method used are sm.Sm.modify_network_sm_devices_tags,
+  - Paths used are post /networks/{networkId}/sm/devices/modifyTags,
 options:
   ids:
     description: The ids of the devices to be modified.
@@ -45,60 +45,55 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm modifyNetworkSmDevicesTags
-  description: Complete reference of the modifyNetworkSmDevicesTags API.
-  link: https://developer.cisco.com/meraki/api-v1/#!modify-network-sm-devices-tags
-notes:
-  - SDK Method used are
-    sm.Sm.modify_network_sm_devices_tags,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/modifyTags,
+  - description: Complete reference of the modifyNetworkSmDevicesTags API.
+    link: https://developer.cisco.com/meraki/api-v1/#!modify-network-sm-devices-tags
+    name: Cisco Meraki documentation for sm modifyNetworkSmDevicesTags
+short_description: Resource module for networks _sm _devices _modify _tags
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_modify_tags:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
     scope:
-    - withAny, old_tag
+      - withAny, old_tag
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     tags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     updateAction: add
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_move.py b/plugins/modules/networks_sm_devices_move.py
index 0a4a627c1..6a5561218 100644
--- a/plugins/modules/networks_sm_devices_move.py
+++ b/plugins/modules/networks_sm_devices_move.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_move
-short_description: Resource module for networks _sm _devices _move
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _move.
-- Move a set of devices to a new network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _move.
+  - Move a set of devices to a new network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_move
+notes:
+  - SDK Method used are sm.Sm.move_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/move,
 options:
   ids:
     description: The ids of the devices to be moved.
@@ -40,59 +40,54 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm moveNetworkSmDevices
-  description: Complete reference of the moveNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!move-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.move_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/move,
+  - description: Complete reference of the moveNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!move-network-sm-devices
+    name: Cisco Meraki documentation for sm moveNetworkSmDevices
+short_description: Resource module for networks _sm _devices _move
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_move:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
     newNetwork: '1284392014819'
     scope:
-    - withAny
-    - tag1
-    - tag2
+      - withAny
+      - tag1
+      - tag2
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_network_adapters_info.py b/plugins/modules/networks_sm_devices_network_adapters_info.py
index 7adcff6d7..cc6a34be9 100644
--- a/plugins/modules/networks_sm_devices_network_adapters_info.py
+++ b/plugins/modules/networks_sm_devices_network_adapters_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_network_adapters_info
-short_description: Information module for networks _sm _devices _network _adapters
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _network _adapters.
-- List the network adapters of a device.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _network _adapters.
+  - List the network adapters of a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_network_adapters_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_network_adapters,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/networkAdapters,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceNetworkAdapters
-  description: Complete reference of the getNetworkSmDeviceNetworkAdapters API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-network-adapters
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_network_adapters,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/networkAdapters,
+  - description: Complete reference of the getNetworkSmDeviceNetworkAdapters API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-network-adapters
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceNetworkAdapters
+short_description: Information module for networks _sm _devices _network _adapters
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _network _adapters
   cisco.meraki.networks_sm_devices_network_adapters_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_performance_history_info.py b/plugins/modules/networks_sm_devices_performance_history_info.py
index 765c8f6a3..0d3d48883 100644
--- a/plugins/modules/networks_sm_devices_performance_history_info.py
+++ b/plugins/modules/networks_sm_devices_performance_history_info.py
@@ -5,85 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_performance_history_info
-short_description: Information module for networks _sm _devices _performance _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _performance _history.
-- Return historical records of various Systems Manager client metrics for desktop devices.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _performance _history.
+  - Return historical records of various Systems Manager client metrics for desktop
+    devices.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_performance_history_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_performance_history,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/performanceHistory,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDevicePerformanceHistory
-  description: Complete reference of the getNetworkSmDevicePerformanceHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-performance-history
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_performance_history,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/performanceHistory,
+  - description: Complete reference of the getNetworkSmDevicePerformanceHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-performance-history
+    name: Cisco Meraki documentation for sm getNetworkSmDevicePerformanceHistory
+short_description: Information module for networks _sm _devices _performance _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _performance _history
   cisco.meraki.networks_sm_devices_performance_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -92,7 +96,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_reboot.py b/plugins/modules/networks_sm_devices_reboot.py
index b4d84e635..f63e96286 100644
--- a/plugins/modules/networks_sm_devices_reboot.py
+++ b/plugins/modules/networks_sm_devices_reboot.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_reboot
-short_description: Resource module for networks _sm _devices _reboot
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _reboot.
-- Reboot a set of endpoints.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _reboot.
+  - Reboot a set of endpoints.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_reboot
+notes:
+  - SDK Method used are sm.Sm.reboot_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/reboot,
 options:
   ids:
     description: The ids of the endpoints to be rebooted.
@@ -29,16 +29,16 @@
     description: NetworkId path parameter. Network ID.
     type: str
   notifyUser:
-    description: Whether or not to notify the user before rebooting the endpoint. Available
-      for macOS 11.3+.
+    description: Whether or not to notify the user before rebooting the endpoint.
+      Available for macOS 11.3+.
     type: bool
   rebuildKernelCache:
     description: Whether or not to rebuild the kernel cache when rebooting the endpoint.
       Available for macOS 11+.
     type: bool
   requestRequiresNetworkTether:
-    description: Whether or not the request requires network tethering. Available for
-      macOS and supervised iOS or tvOS.
+    description: Whether or not the request requires network tethering. Available
+      for macOS and supervised iOS or tvOS.
     type: bool
   scope:
     description: The scope (one of all, none, withAny, withAll, withoutAny, or withoutAll)
@@ -54,63 +54,58 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm rebootNetworkSmDevices
-  description: Complete reference of the rebootNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!reboot-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.reboot_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/reboot,
+  - description: Complete reference of the rebootNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!reboot-network-sm-devices
+    name: Cisco Meraki documentation for sm rebootNetworkSmDevices
+short_description: Resource module for networks _sm _devices _reboot
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_reboot:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     kextPaths:
-    - test
+      - test
     networkId: string
     notifyUser: true
     rebuildKernelCache: true
     requestRequiresNetworkTether: true
     scope:
-    - withAny
-    - tag1
-    - tag2
+      - withAny
+      - tag1
+      - tag2
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_refresh_details.py b/plugins/modules/networks_sm_devices_refresh_details.py
index 8f8e72565..d33babcbc 100644
--- a/plugins/modules/networks_sm_devices_refresh_details.py
+++ b/plugins/modules/networks_sm_devices_refresh_details.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_refresh_details
-short_description: Resource module for networks _sm _devices _refresh _details
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _refresh _details.
-- Refresh the details of a device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _refresh _details.
+  - Refresh the details of a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_refresh_details
+notes:
+  - SDK Method used are sm.Sm.refresh_network_sm_device_details,
+  - Paths used are post /networks/{networkId}/sm/devices/{deviceId}/refreshDetails,
 options:
   deviceId:
     description: DeviceId path parameter. Device ID.
@@ -23,46 +23,41 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm refreshNetworkSmDeviceDetails
-  description: Complete reference of the refreshNetworkSmDeviceDetails API.
-  link: https://developer.cisco.com/meraki/api-v1/#!refresh-network-sm-device-details
-notes:
-  - SDK Method used are
-    sm.Sm.refresh_network_sm_device_details,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/{deviceId}/refreshDetails,
+  - description: Complete reference of the refreshNetworkSmDeviceDetails API.
+    link: https://developer.cisco.com/meraki/api-v1/#!refresh-network-sm-device-details
+    name: Cisco Meraki documentation for sm refreshNetworkSmDeviceDetails
+short_description: Resource module for networks _sm _devices _refresh _details
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_refresh_details:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     deviceId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_security_centers_info.py b/plugins/modules/networks_sm_devices_security_centers_info.py
index c0131bf37..4d9c4c8db 100644
--- a/plugins/modules/networks_sm_devices_security_centers_info.py
+++ b/plugins/modules/networks_sm_devices_security_centers_info.py
@@ -5,75 +5,70 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_security_centers_info
-short_description: Information module for networks _sm _devices _security _centers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _security _centers.
-- Get a list of softwares associated with a device.
-- List the security centers on a device.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _security _centers.
+  - Get a list of softwares associated with a device.
+  - List the security centers on a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_security_centers_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_softwares,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/securityCenters,
+    get /networks/{networkId}/sm/devices/{deviceId}/softwares,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceSecurityCenters
-  description: Complete reference of the getNetworkSmDeviceSecurityCenters API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-security-centers
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceSoftwares
-  description: Complete reference of the getNetworkSmDeviceSoftwares API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-softwares
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_softwares,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/securityCenters,
-    get /networks/{networkId}/sm/devices/{deviceId}/softwares,
+  - description: Complete reference of the getNetworkSmDeviceSecurityCenters API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-security-centers
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceSecurityCenters
+  - description: Complete reference of the getNetworkSmDeviceSoftwares API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-softwares
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceSoftwares
+short_description: Information module for networks _sm _devices _security _centers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _security _centers
   cisco.meraki.networks_sm_devices_security_centers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_shutdown.py b/plugins/modules/networks_sm_devices_shutdown.py
index facaeb6f2..bdee119e7 100644
--- a/plugins/modules/networks_sm_devices_shutdown.py
+++ b/plugins/modules/networks_sm_devices_shutdown.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_shutdown
-short_description: Resource module for networks _sm _devices _shutdown
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _shutdown.
-- Shutdown a set of endpoints.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _shutdown.
+  - Shutdown a set of endpoints.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_shutdown
+notes:
+  - SDK Method used are sm.Sm.shutdown_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/shutdown,
 options:
   ids:
     description: The ids of the endpoints to be shutdown.
@@ -37,58 +37,53 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm shutdownNetworkSmDevices
-  description: Complete reference of the shutdownNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!shutdown-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.shutdown_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/shutdown,
+  - description: Complete reference of the shutdownNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!shutdown-network-sm-devices
+    name: Cisco Meraki documentation for sm shutdownNetworkSmDevices
+short_description: Resource module for networks _sm _devices _shutdown
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_shutdown:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     networkId: string
     scope:
-    - withAny
-    - tag1
-    - tag2
+      - withAny
+      - tag1
+      - tag2
     serials:
-    - XY0XX0Y0X0
-    - A01B01CD00E
-    - X02YZ1ZYZX
+      - XY0XX0Y0X0
+      - A01B01CD00E
+      - X02YZ1ZYZX
     wifiMacs:
-    - 00:11:22:33:44:55
-
+      - 00:11:22:33:44:55
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_unenroll.py b/plugins/modules/networks_sm_devices_unenroll.py
index 560571fe2..cba630d46 100644
--- a/plugins/modules/networks_sm_devices_unenroll.py
+++ b/plugins/modules/networks_sm_devices_unenroll.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_unenroll
-short_description: Resource module for networks _sm _devices _unenroll
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _unenroll.
-- Unenroll a device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _unenroll.
+  - Unenroll a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_unenroll
+notes:
+  - SDK Method used are sm.Sm.unenroll_network_sm_device,
+  - Paths used are post /networks/{networkId}/sm/devices/{deviceId}/unenroll,
 options:
   deviceId:
     description: DeviceId path parameter. Device ID.
@@ -23,46 +23,41 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm unenrollNetworkSmDevice
-  description: Complete reference of the unenrollNetworkSmDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!unenroll-network-sm-device
-notes:
-  - SDK Method used are
-    sm.Sm.unenroll_network_sm_device,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/{deviceId}/unenroll,
+  - description: Complete reference of the unenrollNetworkSmDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!unenroll-network-sm-device
+    name: Cisco Meraki documentation for sm unenrollNetworkSmDevice
+short_description: Resource module for networks _sm _devices _unenroll
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_unenroll:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     deviceId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_uninstall_apps.py b/plugins/modules/networks_sm_devices_uninstall_apps.py
index 1e04fb273..ceac8959d 100644
--- a/plugins/modules/networks_sm_devices_uninstall_apps.py
+++ b/plugins/modules/networks_sm_devices_uninstall_apps.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_uninstall_apps
-short_description: Resource module for networks _sm _devices _uninstall _apps
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _uninstall _apps.
-- Uninstall applications on a device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _uninstall _apps.
+  - Uninstall applications on a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_uninstall_apps
+notes:
+  - SDK Method used are sm.Sm.uninstall_network_sm_device_apps,
+  - Paths used are post /networks/{networkId}/sm/devices/{deviceId}/uninstallApps,
 options:
   appIds:
     description: Ids of applications to be uninstalled.
@@ -27,49 +27,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm uninstallNetworkSmDeviceApps
-  description: Complete reference of the uninstallNetworkSmDeviceApps API.
-  link: https://developer.cisco.com/meraki/api-v1/#!uninstall-network-sm-device-apps
-notes:
-  - SDK Method used are
-    sm.Sm.uninstall_network_sm_device_apps,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/{deviceId}/uninstallApps,
+  - description: Complete reference of the uninstallNetworkSmDeviceApps API.
+    link: https://developer.cisco.com/meraki/api-v1/#!uninstall-network-sm-device-apps
+    name: Cisco Meraki documentation for sm uninstallNetworkSmDeviceApps
+short_description: Resource module for networks _sm _devices _uninstall _apps
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_uninstall_apps:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     appIds:
-    - '1284392014819'
-    - '2983092129865'
+      - '1284392014819'
+      - '2983092129865'
     deviceId: string
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_wipe.py b/plugins/modules/networks_sm_devices_wipe.py
index fe83157b0..c6c1b2f0c 100644
--- a/plugins/modules/networks_sm_devices_wipe.py
+++ b/plugins/modules/networks_sm_devices_wipe.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_wipe
-short_description: Resource module for networks _sm _devices _wipe
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _sm _devices _wipe.
-- Wipe a device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _sm _devices _wipe.
+  - Wipe a device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_wipe
+notes:
+  - SDK Method used are sm.Sm.wipe_network_sm_devices,
+  - Paths used are post /networks/{networkId}/sm/devices/wipe,
 options:
   id:
     description: The id of the device to be wiped.
@@ -33,49 +33,44 @@
     description: The wifiMac of the device to be wiped.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm wipeNetworkSmDevices
-  description: Complete reference of the wipeNetworkSmDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!wipe-network-sm-devices
-notes:
-  - SDK Method used are
-    sm.Sm.wipe_network_sm_devices,
-
-  - Paths used are
-    post /networks/{networkId}/sm/devices/wipe,
+  - description: Complete reference of the wipeNetworkSmDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!wipe-network-sm-devices
+    name: Cisco Meraki documentation for sm wipeNetworkSmDevices
+short_description: Resource module for networks _sm _devices _wipe
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_devices_wipe:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     id: '1284392014819'
     networkId: string
     pin: 123456
     serial: XY0XX0Y0X0
     wifiMac: 00:11:22:33:44:55
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_devices_wlan_lists_info.py b/plugins/modules/networks_sm_devices_wlan_lists_info.py
index 3c8226748..70593be1c 100644
--- a/plugins/modules/networks_sm_devices_wlan_lists_info.py
+++ b/plugins/modules/networks_sm_devices_wlan_lists_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_devices_wlan_lists_info
-short_description: Information module for networks _sm _devices _wlan _lists
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _devices _wlan _lists.
-- List the saved SSID names on a device.
-version_added: '2.16.0'
+  - Get all networks _sm _devices _wlan _lists.
+  - List the saved SSID names on a device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_devices_wlan_lists_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_device_wlan_lists,
+  - Paths used are get /networks/{networkId}/sm/devices/{deviceId}/wlanLists,
 options:
+  deviceId:
+    description:
+      - DeviceId path parameter. Device ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  deviceId:
-    description:
-    - DeviceId path parameter. Device ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmDeviceWlanLists
-  description: Complete reference of the getNetworkSmDeviceWlanLists API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-wlan-lists
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_device_wlan_lists,
-
-  - Paths used are
-    get /networks/{networkId}/sm/devices/{deviceId}/wlanLists,
+  - description: Complete reference of the getNetworkSmDeviceWlanLists API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-device-wlan-lists
+    name: Cisco Meraki documentation for sm getNetworkSmDeviceWlanLists
+short_description: Information module for networks _sm _devices _wlan _lists
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _devices _wlan _lists
   cisco.meraki.networks_sm_devices_wlan_lists_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     deviceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_profiles_info.py b/plugins/modules/networks_sm_profiles_info.py
index 9deb6ed0f..f23fc9e4b 100644
--- a/plugins/modules/networks_sm_profiles_info.py
+++ b/plugins/modules/networks_sm_profiles_info.py
@@ -5,71 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_profiles_info
-short_description: Information module for networks _sm _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _profiles.
-- List all profiles in a network.
-version_added: '2.16.0'
+  - Get all networks _sm _profiles.
+  - List all profiles in a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_profiles_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_profiles,
+  - Paths used are get /networks/{networkId}/sm/profiles,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   payloadTypes:
     description:
-    - PayloadTypes query parameter. Filter by payload types.
+      - PayloadTypes query parameter. Filter by payload types.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmProfiles
-  description: Complete reference of the getNetworkSmProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-profiles
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/sm/profiles,
+  - description: Complete reference of the getNetworkSmProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-profiles
+    name: Cisco Meraki documentation for sm getNetworkSmProfiles
+short_description: Information module for networks _sm _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _profiles
   cisco.meraki.networks_sm_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     payloadTypes: []
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_target_groups.py b/plugins/modules/networks_sm_target_groups.py
index 82c856e8e..4a02eb0e3 100644
--- a/plugins/modules/networks_sm_target_groups.py
+++ b/plugins/modules/networks_sm_target_groups.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_target_groups
-short_description: Resource module for networks _sm _target _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _sm _target _groups.
-- Add a target group.
-- Delete a target group from a network.
-- Update a target group.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _sm _target
+    _groups.
+  - Add a target group.
+  - Delete a target group from a network.
+  - Update a target group.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_target_groups
+notes:
+  - SDK Method used are sm.Sm.create_network_sm_target_group, sm.Sm.delete_network_sm_target_group,
+    sm.Sm.update_network_sm_target_group,
+  - Paths used are post /networks/{networkId}/sm/targetGroups, delete /networks/{networkId}/sm/targetGroups/{targetGroupId},
+    put /networks/{networkId}/sm/targetGroups/{targetGroupId},
 options:
   name:
     description: The name of this target group.
@@ -33,112 +36,101 @@
     description: TargetGroupId path parameter. Target group ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm createNetworkSmTargetGroup
-  description: Complete reference of the createNetworkSmTargetGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-sm-target-group
-- name: Cisco Meraki documentation for sm deleteNetworkSmTargetGroup
-  description: Complete reference of the deleteNetworkSmTargetGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sm-target-group
-- name: Cisco Meraki documentation for sm updateNetworkSmTargetGroup
-  description: Complete reference of the updateNetworkSmTargetGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-sm-target-group
-notes:
-  - SDK Method used are
-    sm.Sm.create_network_sm_target_group,
-    sm.Sm.delete_network_sm_target_group,
-    sm.Sm.update_network_sm_target_group,
-
-  - Paths used are
-    post /networks/{networkId}/sm/targetGroups,
-    delete /networks/{networkId}/sm/targetGroups/{targetGroupId},
-    put /networks/{networkId}/sm/targetGroups/{targetGroupId},
+  - description: Complete reference of the createNetworkSmTargetGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-sm-target-group
+    name: Cisco Meraki documentation for sm createNetworkSmTargetGroup
+  - description: Complete reference of the deleteNetworkSmTargetGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sm-target-group
+    name: Cisco Meraki documentation for sm deleteNetworkSmTargetGroup
+  - description: Complete reference of the updateNetworkSmTargetGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-sm-target-group
+    name: Cisco Meraki documentation for sm updateNetworkSmTargetGroup
+short_description: Resource module for networks _sm _target _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_sm_target_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Target group name
     networkId: string
     scope: withAny, tag1, tag2
-
 - name: Delete by id
   cisco.meraki.networks_sm_target_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     targetGroupId: string
-
 - name: Update by id
   cisco.meraki.networks_sm_target_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Target group name
     networkId: string
     scope: withAny, tag1, tag2
     targetGroupId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_target_groups_info.py b/plugins/modules/networks_sm_target_groups_info.py
index a67be4478..56a54da96 100644
--- a/plugins/modules/networks_sm_target_groups_info.py
+++ b/plugins/modules/networks_sm_target_groups_info.py
@@ -5,110 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_target_groups_info
-short_description: Information module for networks _sm _target _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _target _groups.
-- Get networks _sm _target _groups by id.
-- List the target groups in this network.
-- Return a target group.
-version_added: '2.16.0'
+  - Get all networks _sm _target _groups.
+  - Get networks _sm _target _groups by id.
+  - List the target groups in this network.
+  - Return a target group.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_target_groups_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_target_group, sm.Sm.get_network_sm_target_groups,
+  - Paths used are get /networks/{networkId}/sm/targetGroups, get /networks/{networkId}/sm/targetGroups/{targetGroupId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  withDetails:
-    description:
-    - >
-      WithDetails query parameter. Boolean indicating if the the ids of the devices or users scoped by the target
-      group should be included in the response.
-    type: bool
   targetGroupId:
     description:
-    - TargetGroupId path parameter. Target group ID.
+      - TargetGroupId path parameter. Target group ID.
     type: str
+  withDetails:
+    description:
+      - 'WithDetails query parameter. Boolean indicating if the the ids of the devices
+        or users scoped by the target group should be included in the response.
+
+        '
+    type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmTargetGroup
-  description: Complete reference of the getNetworkSmTargetGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-target-group
-- name: Cisco Meraki documentation for sm getNetworkSmTargetGroups
-  description: Complete reference of the getNetworkSmTargetGroups API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-target-groups
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_target_group,
-    sm.Sm.get_network_sm_target_groups,
-
-  - Paths used are
-    get /networks/{networkId}/sm/targetGroups,
-    get /networks/{networkId}/sm/targetGroups/{targetGroupId},
+  - description: Complete reference of the getNetworkSmTargetGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-target-group
+    name: Cisco Meraki documentation for sm getNetworkSmTargetGroup
+  - description: Complete reference of the getNetworkSmTargetGroups API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-target-groups
+    name: Cisco Meraki documentation for sm getNetworkSmTargetGroups
+short_description: Information module for networks _sm _target _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _target _groups
   cisco.meraki.networks_sm_target_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-    withDetails: True
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
+    withDetails: true
     networkId: string
   register: result
-
 - name: Get networks _sm _target _groups by id
   cisco.meraki.networks_sm_target_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-    withDetails: True
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
+    withDetails: true
     networkId: string
     targetGroupId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_trusted_access_configs_info.py b/plugins/modules/networks_sm_trusted_access_configs_info.py
index 6458cff60..b20ae8d1b 100644
--- a/plugins/modules/networks_sm_trusted_access_configs_info.py
+++ b/plugins/modules/networks_sm_trusted_access_configs_info.py
@@ -5,81 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_trusted_access_configs_info
-short_description: Information module for networks _sm _trusted _access _configs
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _trusted _access _configs.
-- List Trusted Access Configs.
-version_added: '2.16.0'
+  - Get all networks _sm _trusted _access _configs.
+  - List Trusted Access Configs.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_trusted_access_configs_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_trusted_access_configs,
+  - Paths used are get /networks/{networkId}/sm/trustedAccessConfigs,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 100.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmTrustedAccessConfigs
-  description: Complete reference of the getNetworkSmTrustedAccessConfigs API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-trusted-access-configs
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_trusted_access_configs,
-
-  - Paths used are
-    get /networks/{networkId}/sm/trustedAccessConfigs,
+  - description: Complete reference of the getNetworkSmTrustedAccessConfigs API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-trusted-access-configs
+    name: Cisco Meraki documentation for sm getNetworkSmTrustedAccessConfigs
+short_description: Information module for networks _sm _trusted _access _configs
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _trusted _access _configs
   cisco.meraki.networks_sm_trusted_access_configs_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +90,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_user_access_devices_delete.py b/plugins/modules/networks_sm_user_access_devices_delete.py
index ef3441a2b..de8580310 100644
--- a/plugins/modules/networks_sm_user_access_devices_delete.py
+++ b/plugins/modules/networks_sm_user_access_devices_delete.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_user_access_devices_delete
-short_description: Resource module for networks _sm _user _access _devices _delete
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation delete of the resource networks _sm _user _access _devices _delete.
-- Delete a User Access Device.
-version_added: '2.16.0'
+  - Manage operation delete of the resource networks _sm _user _access _devices _delete.
+  - Delete a User Access Device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_user_access_devices_delete
+notes:
+  - SDK Method used are sm.Sm.delete_network_sm_user_access_device,
+  - Paths used are delete /networks/{networkId}/sm/userAccessDevices/{userAccessDeviceId},
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +23,41 @@
     description: UserAccessDeviceId path parameter. User access device ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm deleteNetworkSmUserAccessDevice
-  description: Complete reference of the deleteNetworkSmUserAccessDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sm-user-access-device
-notes:
-  - SDK Method used are
-    sm.Sm.delete_network_sm_user_access_device,
-
-  - Paths used are
-    delete /networks/{networkId}/sm/userAccessDevices/{userAccessDeviceId},
+  - description: Complete reference of the deleteNetworkSmUserAccessDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-sm-user-access-device
+    name: Cisco Meraki documentation for sm deleteNetworkSmUserAccessDevice
+short_description: Resource module for networks _sm _user _access _devices _delete
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Delete by id
   cisco.meraki.networks_sm_user_access_devices_delete:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     userAccessDeviceId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_user_access_devices_info.py b/plugins/modules/networks_sm_user_access_devices_info.py
index e8d9e3432..aa30cafb8 100644
--- a/plugins/modules/networks_sm_user_access_devices_info.py
+++ b/plugins/modules/networks_sm_user_access_devices_info.py
@@ -5,81 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_user_access_devices_info
-short_description: Information module for networks _sm _user _access _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _user _access _devices.
-- List User Access Devices and its Trusted Access Connections.
-version_added: '2.16.0'
+  - Get all networks _sm _user _access _devices.
+  - List User Access Devices and its Trusted Access Connections.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_user_access_devices_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_user_access_devices,
+  - Paths used are get /networks/{networkId}/sm/userAccessDevices,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 100.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmUserAccessDevices
-  description: Complete reference of the getNetworkSmUserAccessDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-access-devices
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_user_access_devices,
-
-  - Paths used are
-    get /networks/{networkId}/sm/userAccessDevices,
+  - description: Complete reference of the getNetworkSmUserAccessDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-access-devices
+    name: Cisco Meraki documentation for sm getNetworkSmUserAccessDevices
+short_description: Information module for networks _sm _user _access _devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _user _access _devices
   cisco.meraki.networks_sm_user_access_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +90,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_users_device_profiles_info.py b/plugins/modules/networks_sm_users_device_profiles_info.py
index 6ea3c92d9..e50fdd32d 100644
--- a/plugins/modules/networks_sm_users_device_profiles_info.py
+++ b/plugins/modules/networks_sm_users_device_profiles_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_users_device_profiles_info
-short_description: Information module for networks _sm _users _device _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _users _device _profiles.
-- Get the profiles associated with a user.
-version_added: '2.16.0'
+  - Get all networks _sm _users _device _profiles.
+  - Get the profiles associated with a user.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_users_device_profiles_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_user_device_profiles,
+  - Paths used are get /networks/{networkId}/sm/users/{userId}/deviceProfiles,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   userId:
     description:
-    - UserId path parameter. User ID.
+      - UserId path parameter. User ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmUserDeviceProfiles
-  description: Complete reference of the getNetworkSmUserDeviceProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-device-profiles
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_user_device_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/sm/users/{userId}/deviceProfiles,
+  - description: Complete reference of the getNetworkSmUserDeviceProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-device-profiles
+    name: Cisco Meraki documentation for sm getNetworkSmUserDeviceProfiles
+short_description: Information module for networks _sm _users _device _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _users _device _profiles
   cisco.meraki.networks_sm_users_device_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     userId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_users_info.py b/plugins/modules/networks_sm_users_info.py
index 80b6839b8..9728f1e2e 100644
--- a/plugins/modules/networks_sm_users_info.py
+++ b/plugins/modules/networks_sm_users_info.py
@@ -5,91 +5,87 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_users_info
-short_description: Information module for networks _sm _users
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _users.
-- List the owners in an SM network with various specified fields and filters.
-version_added: '2.16.0'
+  - Get all networks _sm _users.
+  - List the owners in an SM network with various specified fields and filters.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_users_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_users,
+  - Paths used are get /networks/{networkId}/sm/users,
 options:
+  emails:
+    description:
+      - Emails query parameter. Filter users by email(s).
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
   ids:
     description:
-    - Ids query parameter. Filter users by id(s).
+      - Ids query parameter. Filter users by id(s).
     elements: str
     type: list
-  usernames:
+  networkId:
     description:
-    - Usernames query parameter. Filter users by username(s).
-    elements: str
-    type: list
-  emails:
+      - NetworkId path parameter. Network ID.
+    type: str
+  scope:
     description:
-    - Emails query parameter. Filter users by email(s).
+      - 'Scope query parameter. Specifiy a scope (one of all, none, withAny, withAll,
+        withoutAny, withoutAll) and a set of tags.
+
+        '
     elements: str
     type: list
-  scope:
+  usernames:
     description:
-    - >
-      Scope query parameter. Specifiy a scope (one of all, none, withAny, withAll, withoutAny, withoutAll) and a
-      set of tags.
+      - Usernames query parameter. Filter users by username(s).
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmUsers
-  description: Complete reference of the getNetworkSmUsers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-users
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_users,
-
-  - Paths used are
-    get /networks/{networkId}/sm/users,
+  - description: Complete reference of the getNetworkSmUsers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-users
+    name: Cisco Meraki documentation for sm getNetworkSmUsers
+short_description: Information module for networks _sm _users
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _users
   cisco.meraki.networks_sm_users_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     ids: []
     usernames: []
     emails: []
     scope: []
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_sm_users_softwares_info.py b/plugins/modules/networks_sm_users_softwares_info.py
index 6ae05cbb9..fa38e3aef 100644
--- a/plugins/modules/networks_sm_users_softwares_info.py
+++ b/plugins/modules/networks_sm_users_softwares_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_sm_users_softwares_info
-short_description: Information module for networks _sm _users _softwares
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _sm _users _softwares.
-- Get a list of softwares associated with a user.
-version_added: '2.16.0'
+  - Get all networks _sm _users _softwares.
+  - Get a list of softwares associated with a user.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_sm_users_softwares_info
+notes:
+  - SDK Method used are sm.Sm.get_network_sm_user_softwares,
+  - Paths used are get /networks/{networkId}/sm/users/{userId}/softwares,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   userId:
     description:
-    - UserId path parameter. User ID.
+      - UserId path parameter. User ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getNetworkSmUserSoftwares
-  description: Complete reference of the getNetworkSmUserSoftwares API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-softwares
-notes:
-  - SDK Method used are
-    sm.Sm.get_network_sm_user_softwares,
-
-  - Paths used are
-    get /networks/{networkId}/sm/users/{userId}/softwares,
+  - description: Complete reference of the getNetworkSmUserSoftwares API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-sm-user-softwares
+    name: Cisco Meraki documentation for sm getNetworkSmUserSoftwares
+short_description: Information module for networks _sm _users _softwares
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _sm _users _softwares
   cisco.meraki.networks_sm_users_softwares_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     userId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_snmp.py b/plugins/modules/networks_snmp.py
index f9b6c0a6d..1e6f8ec9e 100644
--- a/plugins/modules/networks_snmp.py
+++ b/plugins/modules/networks_snmp.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_snmp
-short_description: Resource module for networks _snmp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _snmp.
-- Update the SNMP settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _snmp.
+  - Update the SNMP settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_snmp
+notes:
+  - SDK Method used are networks.Networks.update_network_snmp,
+  - Paths used are put /networks/{networkId}/snmp,
 options:
   access:
     description: The type of SNMP access. Can be one of 'none' (disabled), 'community'
@@ -38,51 +38,46 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkSnmp
-  description: Complete reference of the updateNetworkSnmp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-snmp
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_snmp,
-
-  - Paths used are
-    put /networks/{networkId}/snmp,
+  - description: Complete reference of the updateNetworkSnmp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-snmp
+    name: Cisco Meraki documentation for networks updateNetworkSnmp
+short_description: Resource module for networks _snmp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_snmp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     access: users
     communityString: sample
     networkId: string
     users:
-    - passphrase: hunter2
-      username: AzureDiamond
-
+      - passphrase: hunter2
+        username: AzureDiamond
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_snmp_info.py b/plugins/modules/networks_snmp_info.py
index 31fbc2aab..2d79bb861 100644
--- a/plugins/modules/networks_snmp_info.py
+++ b/plugins/modules/networks_snmp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_snmp_info
-short_description: Information module for networks _snmp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _snmp.
-- Return the SNMP settings for a network.
-version_added: '2.16.0'
+  - Get all networks _snmp.
+  - Return the SNMP settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_snmp_info
+notes:
+  - SDK Method used are networks.Networks.get_network_snmp,
+  - Paths used are get /networks/{networkId}/snmp,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkSnmp
-  description: Complete reference of the getNetworkSnmp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-snmp
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_snmp,
-
-  - Paths used are
-    get /networks/{networkId}/snmp,
+  - description: Complete reference of the getNetworkSnmp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-snmp
+    name: Cisco Meraki documentation for networks getNetworkSnmp
+short_description: Information module for networks _snmp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _snmp
   cisco.meraki.networks_snmp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_split.py b/plugins/modules/networks_split.py
index af15765be..f6481b14a 100644
--- a/plugins/modules/networks_split.py
+++ b/plugins/modules/networks_split.py
@@ -5,60 +5,55 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_split
-short_description: Resource module for networks _split
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _split.
-- Split a combined network into individual networks for each type of device.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _split.
+  - Split a combined network into individual networks for each type of device.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_split
+notes:
+  - SDK Method used are networks.Networks.split_network,
+  - Paths used are post /networks/{networkId}/split,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks splitNetwork
-  description: Complete reference of the splitNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!split-network
-notes:
-  - SDK Method used are
-    networks.Networks.split_network,
-
-  - Paths used are
-    post /networks/{networkId}/split,
+  - description: Complete reference of the splitNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!split-network
+    name: Cisco Meraki documentation for networks splitNetwork
+short_description: Resource module for networks _split
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_split:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_access_control_lists.py b/plugins/modules/networks_switch_access_control_lists.py
index f31acbee0..2900ff2df 100644
--- a/plugins/modules/networks_switch_access_control_lists.py
+++ b/plugins/modules/networks_switch_access_control_lists.py
@@ -5,23 +5,23 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_access_control_lists
-short_description: Resource module for networks _switch _access _control _lists
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _access _control _lists.
-- Update the access control lists for a MS network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _access _control _lists.
+  - Update the access control lists for a MS network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_access_control_lists
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_access_control_lists,
+  - Paths used are put /networks/{networkId}/switch/accessControlLists,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
     type: str
   rules:
-    description: An ordered array of the access control list rules (not including the
-      default rule). An empty array will clear the rules.
+    description: An ordered array of the access control list rules (not including
+      the default rule). An empty array will clear the rules.
     elements: dict
     suboptions:
       comment:
@@ -57,56 +57,51 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchAccessControlLists
-  description: Complete reference of the updateNetworkSwitchAccessControlLists API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-access-control-lists
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_access_control_lists,
-
-  - Paths used are
-    put /networks/{networkId}/switch/accessControlLists,
+  - description: Complete reference of the updateNetworkSwitchAccessControlLists API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-access-control-lists
+    name: Cisco Meraki documentation for switch updateNetworkSwitchAccessControlLists
+short_description: Resource module for networks _switch _access _control _lists
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_access_control_lists:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rules:
-    - comment: Deny SSH
-      dstCidr: 172.16.30/24
-      dstPort: '22'
-      ipVersion: ipv4
-      policy: deny
-      protocol: tcp
-      srcCidr: 10.1.10.0/24
-      srcPort: any
-      vlan: '10'
-
+      - comment: Deny SSH
+        dstCidr: 172.16.30/24
+        dstPort: '22'
+        ipVersion: ipv4
+        policy: deny
+        protocol: tcp
+        srcCidr: 10.1.10.0/24
+        srcPort: any
+        vlan: '10'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_access_control_lists_info.py b/plugins/modules/networks_switch_access_control_lists_info.py
index 9e814e617..d299c1401 100644
--- a/plugins/modules/networks_switch_access_control_lists_info.py
+++ b/plugins/modules/networks_switch_access_control_lists_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_access_control_lists_info
-short_description: Information module for networks _switch _access _control _lists
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _access _control _lists.
-- Return the access control lists for a MS network.
-version_added: '2.16.0'
+  - Get all networks _switch _access _control _lists.
+  - Return the access control lists for a MS network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_access_control_lists_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_access_control_lists,
+  - Paths used are get /networks/{networkId}/switch/accessControlLists,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchAccessControlLists
-  description: Complete reference of the getNetworkSwitchAccessControlLists API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-control-lists
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_access_control_lists,
-
-  - Paths used are
-    get /networks/{networkId}/switch/accessControlLists,
+  - description: Complete reference of the getNetworkSwitchAccessControlLists API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-control-lists
+    name: Cisco Meraki documentation for switch getNetworkSwitchAccessControlLists
+short_description: Information module for networks _switch _access _control _lists
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _access _control _lists
   cisco.meraki.networks_switch_access_control_lists_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_access_policies.py b/plugins/modules/networks_switch_access_policies.py
index 32519bc25..bca2f7310 100644
--- a/plugins/modules/networks_switch_access_policies.py
+++ b/plugins/modules/networks_switch_access_policies.py
@@ -5,29 +5,34 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_access_policies
-short_description: Resource module for networks _switch _access _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _access _policies.
-- >
-   Create an access policy for a switch network. If you would like to enable Meraki Authentication, set radiusServers
-   to empty array.
-- Delete an access policy for a switch network.
-- >
-   Update an access policy for a switch network. If you would like to enable Meraki Authentication, set radiusServers
-   to empty array.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _access
+    _policies.
+  - 'Create an access policy for a switch network. If you would like to enable Meraki
+    Authentication, set radiusServers to empty array.
+
+    '
+  - Delete an access policy for a switch network.
+  - 'Update an access policy for a switch network. If you would like to enable Meraki
+    Authentication, set radiusServers to empty array.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_access_policies
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_access_policy, switch.Switch.delete_network_switch_access_policy,
+    switch.Switch.update_network_switch_access_policy,
+  - Paths used are post /networks/{networkId}/switch/accessPolicies, delete /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
+    put /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
 options:
   accessPolicyNumber:
     description: AccessPolicyNumber path parameter. Access policy number.
     type: str
   accessPolicyType:
-    description: Access Type of the policy. Automatically 'Hybrid authentication' when
-      hostMode is 'Multi-Domain'.
+    description: Access Type of the policy. Automatically 'Hybrid authentication'
+      when hostMode is 'Multi-Domain'.
     type: str
   dot1x:
     description: 802.1x Settings.
@@ -39,8 +44,8 @@
         type: str
     type: dict
   guestPortBouncing:
-    description: If enabled, Meraki devices will periodically send access-request messages
-      to these RADIUS servers.
+    description: If enabled, Meraki devices will periodically send access-request
+      messages to these RADIUS servers.
     type: bool
   guestVlanId:
     description: ID for the guest VLAN allow unauthorized devices access to limited
@@ -77,8 +82,8 @@
             type: int
         type: dict
       criticalAuth:
-        description: Critical auth settings for when authentication is rejected by the
-          RADIUS server.
+        description: Critical auth settings for when authentication is rejected by
+          the RADIUS server.
         suboptions:
           dataVlanId:
             description: VLAN that clients who use data will be placed on when RADIUS
@@ -97,8 +102,8 @@
           fails. Will be null if hostMode is Multi-Auth.
         type: int
       reAuthenticationInterval:
-        description: Re-authentication period in seconds. Will be null if hostMode is
-          Multi-Auth.
+        description: Re-authentication period in seconds. Will be null if hostMode
+          is Multi-Auth.
         type: int
     type: dict
   radiusAccountingEnabled:
@@ -129,7 +134,8 @@
     description: Change of authentication for RADIUS re-authentication and disconnection.
     type: bool
   radiusGroupAttribute:
-    description: Acceptable values are `""` for None, or `"11"` for Group Policies ACL.
+    description: Acceptable values are `""` for None, or `"11"` for Group Policies
+      ACL.
     type: str
   radiusServers:
     description: List of RADIUS servers to require connecting devices to authenticate
@@ -151,8 +157,8 @@
         type: str
     type: list
   radiusTestingEnabled:
-    description: If enabled, Meraki devices will periodically send access-request messages
-      to these RADIUS servers.
+    description: If enabled, Meraki devices will periodically send access-request
+      messages to these RADIUS servers.
     type: bool
   urlRedirectWalledGardenEnabled:
     description: Enable to restrict access for clients to a specific set of IP addresses
@@ -168,53 +174,45 @@
       true when hostMode is 'Multi-Domain'.
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchAccessPolicy
-  description: Complete reference of the createNetworkSwitchAccessPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-access-policy
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchAccessPolicy
-  description: Complete reference of the deleteNetworkSwitchAccessPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-access-policy
-- name: Cisco Meraki documentation for switch updateNetworkSwitchAccessPolicy
-  description: Complete reference of the updateNetworkSwitchAccessPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-access-policy
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_access_policy,
-    switch.Switch.delete_network_switch_access_policy,
-    switch.Switch.update_network_switch_access_policy,
-
-  - Paths used are
-    post /networks/{networkId}/switch/accessPolicies,
-    delete /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
-    put /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
+  - description: Complete reference of the createNetworkSwitchAccessPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-access-policy
+    name: Cisco Meraki documentation for switch createNetworkSwitchAccessPolicy
+  - description: Complete reference of the deleteNetworkSwitchAccessPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-access-policy
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchAccessPolicy
+  - description: Complete reference of the updateNetworkSwitchAccessPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-access-policy
+    name: Cisco Meraki documentation for switch updateNetworkSwitchAccessPolicy
+short_description: Resource module for networks _switch _access _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_access_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPolicyType: Hybrid authentication
     dot1x:
@@ -237,71 +235,69 @@
       reAuthenticationInterval: 120
     radiusAccountingEnabled: true
     radiusAccountingServers:
-    - host: 1.2.3.4
-      organizationRadiusServerId: '42'
-      port: 22
-      secret: secret
+      - host: 1.2.3.4
+        organizationRadiusServerId: '42'
+        port: 22
+        secret: secret
     radiusCoaSupportEnabled: false
     radiusGroupAttribute: '11'
     radiusServers:
-    - host: 1.2.3.4
-      organizationRadiusServerId: '42'
-      port: 22
-      secret: secret
+      - host: 1.2.3.4
+        organizationRadiusServerId: '42'
+        port: 22
+        secret: secret
     radiusTestingEnabled: false
     urlRedirectWalledGardenEnabled: true
     urlRedirectWalledGardenRanges:
-    - 192.168.1.0/24
+      - 192.168.1.0/24
     voiceVlanClients: true
-
 - name: Delete by id
   cisco.meraki.networks_switch_access_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     accessPolicyNumber: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_access_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPolicyNumber: string
     accessPolicyType: Hybrid authentication
@@ -325,25 +321,24 @@
       reAuthenticationInterval: 120
     radiusAccountingEnabled: true
     radiusAccountingServers:
-    - host: 1.2.3.4
-      organizationRadiusServerId: '42'
-      port: 22
-      secret: secret
-      serverId: '2'
+      - host: 1.2.3.4
+        organizationRadiusServerId: '42'
+        port: 22
+        secret: secret
+        serverId: '2'
     radiusCoaSupportEnabled: false
     radiusGroupAttribute: '11'
     radiusServers:
-    - host: 1.2.3.4
-      organizationRadiusServerId: '42'
-      port: 22
-      secret: secret
-      serverId: '1'
+      - host: 1.2.3.4
+        organizationRadiusServerId: '42'
+        port: 22
+        secret: secret
+        serverId: '1'
     radiusTestingEnabled: false
     urlRedirectWalledGardenEnabled: true
     urlRedirectWalledGardenRanges:
-    - 192.168.1.0/24
+      - 192.168.1.0/24
     voiceVlanClients: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_access_policies_info.py b/plugins/modules/networks_switch_access_policies_info.py
index 8b54f5037..ce7c7bb15 100644
--- a/plugins/modules/networks_switch_access_policies_info.py
+++ b/plugins/modules/networks_switch_access_policies_info.py
@@ -5,104 +5,97 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_access_policies_info
-short_description: Information module for networks _switch _access _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _access _policies.
-- Get networks _switch _access _policies by id.
-- >
-   List the access policies for a switch network. Only returns access policies with 'my RADIUS server' as
-   authentication method.
-- Return a specific access policy for a switch network.
-version_added: '2.16.0'
+  - Get all networks _switch _access _policies.
+  - Get networks _switch _access _policies by id.
+  - 'List the access policies for a switch network. Only returns access policies with
+    ''my RADIUS server'' as authentication method.
+
+    '
+  - Return a specific access policy for a switch network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_access_policies_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_access_policies, switch.Switch.get_network_switch_access_policy,
+  - Paths used are get /networks/{networkId}/switch/accessPolicies, get /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
 options:
+  accessPolicyNumber:
+    description:
+      - AccessPolicyNumber path parameter. Access policy number.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  accessPolicyNumber:
-    description:
-    - AccessPolicyNumber path parameter. Access policy number.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchAccessPolicies
-  description: Complete reference of the getNetworkSwitchAccessPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policies
-- name: Cisco Meraki documentation for switch getNetworkSwitchAccessPolicy
-  description: Complete reference of the getNetworkSwitchAccessPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policy
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_access_policies,
-    switch.Switch.get_network_switch_access_policy,
-
-  - Paths used are
-    get /networks/{networkId}/switch/accessPolicies,
-    get /networks/{networkId}/switch/accessPolicies/{accessPolicyNumber},
+  - description: Complete reference of the getNetworkSwitchAccessPolicies API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policies
+    name: Cisco Meraki documentation for switch getNetworkSwitchAccessPolicies
+  - description: Complete reference of the getNetworkSwitchAccessPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policy
+    name: Cisco Meraki documentation for switch getNetworkSwitchAccessPolicy
+short_description: Information module for networks _switch _access _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _access _policies
   cisco.meraki.networks_switch_access_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _switch _access _policies by id
   cisco.meraki.networks_switch_access_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     accessPolicyNumber: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_alternate_management_interface.py b/plugins/modules/networks_switch_alternate_management_interface.py
index 2efe2104f..f69ae050c 100644
--- a/plugins/modules/networks_switch_alternate_management_interface.py
+++ b/plugins/modules/networks_switch_alternate_management_interface.py
@@ -5,20 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_alternate_management_interface
-short_description: Resource module for networks _switch _alternate _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _alternate _management _interface.
-- Update the switch alternate management interface for the network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _alternate _management
+    _interface.
+  - Update the switch alternate management interface for the network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_alternate_management_interface
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_alternate_management_interface,
+  - Paths used are put /networks/{networkId}/switch/alternateManagementInterface,
 options:
   enabled:
-    description: Boolean value to enable or disable AMI configuration. If enabled, VLAN
-      and protocols must be set.
+    description: Boolean value to enable or disable AMI configuration. If enabled,
+      VLAN and protocols must be set.
     type: bool
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -28,10 +29,11 @@
     elements: str
     type: list
   switches:
-    description: Array of switch serial number and IP assignment. If parameter is present,
-      it cannot have empty body. Note switches parameter is not applicable for template
-      networks, in other words, do not put 'switches' in the body when updating template
-      networks. Also, an empty 'switches' array will remove all previous assignments.
+    description: Array of switch serial number and IP assignment. If parameter is
+      present, it cannot have empty body. Note switches parameter is not applicable
+      for template networks, in other words, do not put 'switches' in the body when
+      updating template networks. Also, an empty 'switches' array will remove all
+      previous assignments.
     elements: dict
     suboptions:
       alternateManagementIp:
@@ -54,57 +56,53 @@
     description: Alternate management VLAN, must be between 1 and 4094.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchAlternateManagementInterface
-  description: Complete reference of the updateNetworkSwitchAlternateManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-alternate-management-interface
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_alternate_management_interface,
-
-  - Paths used are
-    put /networks/{networkId}/switch/alternateManagementInterface,
+  - description: Complete reference of the updateNetworkSwitchAlternateManagementInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-alternate-management-interface
+    name: Cisco Meraki documentation for switch updateNetworkSwitchAlternateManagementInterface
+short_description: Resource module for networks _switch _alternate _management _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_alternate_management_interface:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     networkId: string
     protocols:
-    - radius
-    - snmp
-    - syslog
+      - radius
+      - snmp
+      - syslog
     switches:
-    - alternateManagementIp: 1.2.3.4
-      gateway: 1.2.3.5
-      serial: Q234-ABCD-5678
-      subnetMask: 255.255.255.0
+      - alternateManagementIp: 1.2.3.4
+        gateway: 1.2.3.5
+        serial: Q234-ABCD-5678
+        subnetMask: 255.255.255.0
     vlanId: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_alternate_management_interface_info.py b/plugins/modules/networks_switch_alternate_management_interface_info.py
index 68ddda2d0..02d9faf99 100644
--- a/plugins/modules/networks_switch_alternate_management_interface_info.py
+++ b/plugins/modules/networks_switch_alternate_management_interface_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_alternate_management_interface_info
-short_description: Information module for networks _switch _alternate _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _alternate _management _interface.
-- Return the switch alternate management interface for the network.
-version_added: '2.16.0'
+  - Get all networks _switch _alternate _management _interface.
+  - Return the switch alternate management interface for the network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_alternate_management_interface_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_alternate_management_interface,
+  - Paths used are get /networks/{networkId}/switch/alternateManagementInterface,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchAlternateManagementInterface
-  description: Complete reference of the getNetworkSwitchAlternateManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-alternate-management-interface
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_alternate_management_interface,
-
-  - Paths used are
-    get /networks/{networkId}/switch/alternateManagementInterface,
+  - description: Complete reference of the getNetworkSwitchAlternateManagementInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-alternate-management-interface
+    name: Cisco Meraki documentation for switch getNetworkSwitchAlternateManagementInterface
+short_description: Information module for networks _switch _alternate _management
+  _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _alternate _management _interface
   cisco.meraki.networks_switch_alternate_management_interface_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_server_policy.py b/plugins/modules/networks_switch_dhcp_server_policy.py
index bbe75bba4..45174ea63 100644
--- a/plugins/modules/networks_switch_dhcp_server_policy.py
+++ b/plugins/modules/networks_switch_dhcp_server_policy.py
@@ -5,18 +5,19 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_server_policy
-short_description: Resource module for networks _switch _dhcp _server _policy
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _dhcp _server _policy.
-- >
-   Update the DHCP server settings. Blocked/allowed servers are only applied when default policy is allow/block,
-   respectively.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _dhcp _server _policy.
+  - 'Update the DHCP server settings. Blocked/allowed servers are only applied when
+    default policy is allow/block, respectively.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_server_policy
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_dhcp_server_policy,
+  - Paths used are put /networks/{networkId}/switch/dhcpServerPolicy,
 options:
   alerts:
     description: Alert settings for DHCP servers.
@@ -25,8 +26,8 @@
         description: Email alert settings for DHCP servers.
         suboptions:
           enabled:
-            description: When enabled, send an email if a new DHCP server is seen. Default
-              value is false.
+            description: When enabled, send an email if a new DHCP server is seen.
+              Default value is false.
             type: bool
         type: dict
     type: dict
@@ -55,58 +56,53 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchDhcpServerPolicy
-  description: Complete reference of the updateNetworkSwitchDhcpServerPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dhcp-server-policy
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_dhcp_server_policy,
-
-  - Paths used are
-    put /networks/{networkId}/switch/dhcpServerPolicy,
+  - description: Complete reference of the updateNetworkSwitchDhcpServerPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dhcp-server-policy
+    name: Cisco Meraki documentation for switch updateNetworkSwitchDhcpServerPolicy
+short_description: Resource module for networks _switch _dhcp _server _policy
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_dhcp_server_policy:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     alerts:
       email:
         enabled: true
     allowedServers:
-    - 00:50:56:00:00:01
-    - 00:50:56:00:00:02
+      - 00:50:56:00:00:01
+      - 00:50:56:00:00:02
     arpInspection:
       enabled: true
     blockedServers:
-    - 00:50:56:00:00:03
-    - 00:50:56:00:00:04
+      - 00:50:56:00:00:03
+      - 00:50:56:00:00:04
     defaultPolicy: block
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers.py b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers.py
index 76116c757..22c9ef861 100644
--- a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers.py
+++ b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers.py
@@ -5,18 +5,23 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_server_policy_arp_inspection_trusted_servers
-short_description: Resource module for networks _switch _dhcp _server _policy _arp _inspection _trusted _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _dhcp _server _policy _arp _inspection _trusted _servers.
-- Add a server to be trusted by Dynamic ARP Inspection on this network.
-- Remove a server from being trusted by Dynamic ARP Inspection on this network.
-- Update a server that is trusted by Dynamic ARP Inspection on this network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _dhcp
+    _server _policy _arp _inspection _trusted _servers.
+  - Add a server to be trusted by Dynamic ARP Inspection on this network.
+  - Remove a server from being trusted by Dynamic ARP Inspection on this network.
+  - Update a server that is trusted by Dynamic ARP Inspection on this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_server_policy_arp_inspection_trusted_servers
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
+    switch.Switch.delete_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
+    switch.Switch.update_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
+  - Paths used are post /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers,
+    delete /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers/{trustedServerId},
+    put /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers/{trustedServerId},
 options:
   ipv4:
     description: The IPv4 attributes of the trusted server being added.
@@ -35,112 +40,106 @@
     description: TrustedServerId path parameter. Trusted server ID.
     type: str
   vlan:
-    description: The VLAN of the trusted server being added. It must be between 1 and
-      4094.
+    description: The VLAN of the trusted server being added. It must be between 1
+      and 4094.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
-  description: Complete reference of the createNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-dhcp-server-policy-arp-inspection-trusted-server
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
-  description: Complete reference of the deleteNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-dhcp-server-policy-arp-inspection-trusted-server
-- name: Cisco Meraki documentation for switch updateNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
-  description: Complete reference of the updateNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dhcp-server-policy-arp-inspection-trusted-server
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
-    switch.Switch.delete_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
-    switch.Switch.update_network_switch_dhcp_server_policy_arp_inspection_trusted_server,
-
-  - Paths used are
-    post /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers,
-    delete /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers/{trustedServerId},
-    put /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers/{trustedServerId},
+  - description: Complete reference of the createNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-dhcp-server-policy-arp-inspection-trusted-server
+    name: Cisco Meraki documentation for switch createNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+  - description: Complete reference of the deleteNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-dhcp-server-policy-arp-inspection-trusted-server
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+  - description: Complete reference of the updateNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dhcp-server-policy-arp-inspection-trusted-server
+    name: Cisco Meraki documentation for switch updateNetworkSwitchDhcpServerPolicyArpInspectionTrustedServer
+short_description: Resource module for networks _switch _dhcp _server _policy _arp
+  _inspection _trusted _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_dhcp_server_policy_arp_inspection_trusted_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     ipv4:
       address: 1.2.3.4
     mac: 00:11:22:33:44:55
     networkId: string
     vlan: 100
-
 - name: Delete by id
   cisco.meraki.networks_switch_dhcp_server_policy_arp_inspection_trusted_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     trustedServerId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_dhcp_server_policy_arp_inspection_trusted_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     ipv4:
       address: 1.2.3.4
@@ -148,7 +147,6 @@
     networkId: string
     trustedServerId: string
     vlan: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info.py b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info.py
index 6a5dff3f8..6d3728523 100644
--- a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info.py
+++ b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info.py
@@ -5,83 +5,89 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info
-short_description: Information module for networks _switch _dhcp _server _policy _arp _inspection _trusted _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _dhcp _server _policy _arp _inspection _trusted _servers.
-- >
-   Return the list of servers trusted by Dynamic ARP Inspection on this network. These are also known as allow listed
-   snoop entries.
-version_added: '2.16.0'
+  - Get all networks _switch _dhcp _server _policy _arp _inspection _trusted _servers.
+  - 'Return the list of servers trusted by Dynamic ARP Inspection on this network.
+    These are also known as allow listed snoop entries.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_dhcp_server_policy_arp_inspection_trusted_servers,
+  - Paths used are get /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicyArpInspectionTrustedServers
-  description: Complete reference of the getNetworkSwitchDhcpServerPolicyArpInspectionTrustedServers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy-arp-inspection-trusted-servers
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_dhcp_server_policy_arp_inspection_trusted_servers,
-
-  - Paths used are
-    get /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/trustedServers,
+  - description: Complete reference of the getNetworkSwitchDhcpServerPolicyArpInspectionTrustedServers
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy-arp-inspection-trusted-servers
+    name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicyArpInspectionTrustedServers
+short_description: Information module for networks _switch _dhcp _server _policy _arp
+  _inspection _trusted _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _dhcp _server _policy _arp _inspection _trusted _servers
   cisco.meraki.networks_switch_dhcp_server_policy_arp_inspection_trusted_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -89,7 +95,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info.py b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info.py
index 12881d325..8c2e5d74c 100644
--- a/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info.py
+++ b/plugins/modules/networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info.py
@@ -5,81 +5,88 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info
-short_description: Information module for networks _switch _dhcp _server _policy _arp _inspection _warnings _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _dhcp _server _policy _arp _inspection _warnings _by _device.
-- Return the devices that have a Dynamic ARP Inspection warning and their warnings.
-version_added: '2.16.0'
+  - Get all networks _switch _dhcp _server _policy _arp _inspection _warnings _by
+    _device.
+  - Return the devices that have a Dynamic ARP Inspection warning and their warnings.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_dhcp_server_policy_arp_inspection_warnings_by_device,
+  - Paths used are get /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/warnings/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicyArpInspectionWarningsByDevice
-  description: Complete reference of the getNetworkSwitchDhcpServerPolicyArpInspectionWarningsByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy-arp-inspection-warnings-by-device
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_dhcp_server_policy_arp_inspection_warnings_by_device,
-
-  - Paths used are
-    get /networks/{networkId}/switch/dhcpServerPolicy/arpInspection/warnings/byDevice,
+  - description: Complete reference of the getNetworkSwitchDhcpServerPolicyArpInspectionWarningsByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy-arp-inspection-warnings-by-device
+    name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicyArpInspectionWarningsByDevice
+short_description: Information module for networks _switch _dhcp _server _policy _arp
+  _inspection _warnings _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
-- name: Get all networks _switch _dhcp _server _policy _arp _inspection _warnings _by _device
+- name: Get all networks _switch _dhcp _server _policy _arp _inspection _warnings
+    _by _device
   cisco.meraki.networks_switch_dhcp_server_policy_arp_inspection_warnings_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +94,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_server_policy_info.py b/plugins/modules/networks_switch_dhcp_server_policy_info.py
index 79abe11e3..d6f1f93f7 100644
--- a/plugins/modules/networks_switch_dhcp_server_policy_info.py
+++ b/plugins/modules/networks_switch_dhcp_server_policy_info.py
@@ -5,67 +5,63 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_server_policy_info
-short_description: Information module for networks _switch _dhcp _server _policy
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _dhcp _server _policy.
-- >
-   Return the DHCP server settings. Blocked/allowed servers are only applied when default policy is allow/block,
-   respectively.
-version_added: '2.16.0'
+  - Get all networks _switch _dhcp _server _policy.
+  - 'Return the DHCP server settings. Blocked/allowed servers are only applied when
+    default policy is allow/block, respectively.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_server_policy_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_dhcp_server_policy,
+  - Paths used are get /networks/{networkId}/switch/dhcpServerPolicy,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicy
-  description: Complete reference of the getNetworkSwitchDhcpServerPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_dhcp_server_policy,
-
-  - Paths used are
-    get /networks/{networkId}/switch/dhcpServerPolicy,
+  - description: Complete reference of the getNetworkSwitchDhcpServerPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-server-policy
+    name: Cisco Meraki documentation for switch getNetworkSwitchDhcpServerPolicy
+short_description: Information module for networks _switch _dhcp _server _policy
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _dhcp _server _policy
   cisco.meraki.networks_switch_dhcp_server_policy_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dhcp_v4_servers_seen_info.py b/plugins/modules/networks_switch_dhcp_v4_servers_seen_info.py
index b95a1890f..63173a911 100644
--- a/plugins/modules/networks_switch_dhcp_v4_servers_seen_info.py
+++ b/plugins/modules/networks_switch_dhcp_v4_servers_seen_info.py
@@ -5,92 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dhcp_v4_servers_seen_info
-short_description: Information module for networks _switch _dhcp v4 _servers _seen
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _dhcp v4 _servers _seen.
-- Return the network's DHCPv4 servers seen within the selected timeframe default 1 day .
-version_added: '2.16.0'
+  - Get all networks _switch _dhcp v4 _servers _seen.
+  - Return the network's DHCPv4 servers seen within the selected timeframe default
+    1 day .
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dhcp_v4_servers_seen_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_dhcp_v4_servers_seen,
+  - Paths used are get /networks/{networkId}/switch/dhcp/v4/servers/seen,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
-    type: float
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  endingBefore:
+  t0:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchDhcpV4ServersSeen
-  description: Complete reference of the getNetworkSwitchDhcpV4ServersSeen API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-v4-servers-seen
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_dhcp_v4_servers_seen,
-
-  - Paths used are
-    get /networks/{networkId}/switch/dhcp/v4/servers/seen,
+  - description: Complete reference of the getNetworkSwitchDhcpV4ServersSeen API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dhcp-v4-servers-seen
+    name: Cisco Meraki documentation for switch getNetworkSwitchDhcpV4ServersSeen
+short_description: Information module for networks _switch _dhcp v4 _servers _seen
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _dhcp v4 _servers _seen
   cisco.meraki.networks_switch_dhcp_v4_servers_seen_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     timespan: 0
     perPage: 0
@@ -100,7 +106,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dscp_to_cos_mappings.py b/plugins/modules/networks_switch_dscp_to_cos_mappings.py
index 790b148de..2b493aef5 100644
--- a/plugins/modules/networks_switch_dscp_to_cos_mappings.py
+++ b/plugins/modules/networks_switch_dscp_to_cos_mappings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dscp_to_cos_mappings
-short_description: Resource module for networks _switch _dscp _to _cos _mappings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _dscp _to _cos _mappings.
-- Update the DSCP to CoS mappings.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _dscp _to _cos _mappings.
+  - Update the DSCP to CoS mappings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dscp_to_cos_mappings
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_dscp_to_cos_mappings,
+  - Paths used are put /networks/{networkId}/switch/dscpToCosMappings,
 options:
   mappings:
     description: An array of DSCP to CoS mappings. An empty array will reset the mappings
@@ -23,12 +23,13 @@
     suboptions:
       cos:
         description: The actual layer-2 CoS queue the DSCP value is mapped to. These
-          are not bits set on outgoing frames. Value can be in the range of 0 to 5 inclusive.
+          are not bits set on outgoing frames. Value can be in the range of 0 to 5
+          inclusive.
         type: int
       dscp:
         description: The Differentiated Services Code Point (DSCP) tag in the IP header
-          that will be mapped to a particular Class-of-Service (CoS) queue. Value can
-          be in the range of 0 to 63 inclusive.
+          that will be mapped to a particular Class-of-Service (CoS) queue. Value
+          can be in the range of 0 to 63 inclusive.
         type: int
       title:
         description: Label for the mapping (optional).
@@ -38,50 +39,45 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchDscpToCosMappings
-  description: Complete reference of the updateNetworkSwitchDscpToCosMappings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dscp-to-cos-mappings
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_dscp_to_cos_mappings,
-
-  - Paths used are
-    put /networks/{networkId}/switch/dscpToCosMappings,
+  - description: Complete reference of the updateNetworkSwitchDscpToCosMappings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-dscp-to-cos-mappings
+    name: Cisco Meraki documentation for switch updateNetworkSwitchDscpToCosMappings
+short_description: Resource module for networks _switch _dscp _to _cos _mappings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_dscp_to_cos_mappings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     mappings:
-    - cos: 1
-      dscp: 1
-      title: Video
+      - cos: 1
+        dscp: 1
+        title: Video
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_dscp_to_cos_mappings_info.py b/plugins/modules/networks_switch_dscp_to_cos_mappings_info.py
index 86db2b943..ecae325bb 100644
--- a/plugins/modules/networks_switch_dscp_to_cos_mappings_info.py
+++ b/plugins/modules/networks_switch_dscp_to_cos_mappings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_dscp_to_cos_mappings_info
-short_description: Information module for networks _switch _dscp _to _cos _mappings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _dscp _to _cos _mappings.
-- Return the DSCP to CoS mappings.
-version_added: '2.16.0'
+  - Get all networks _switch _dscp _to _cos _mappings.
+  - Return the DSCP to CoS mappings.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_dscp_to_cos_mappings_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_dscp_to_cos_mappings,
+  - Paths used are get /networks/{networkId}/switch/dscpToCosMappings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchDscpToCosMappings
-  description: Complete reference of the getNetworkSwitchDscpToCosMappings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dscp-to-cos-mappings
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_dscp_to_cos_mappings,
-
-  - Paths used are
-    get /networks/{networkId}/switch/dscpToCosMappings,
+  - description: Complete reference of the getNetworkSwitchDscpToCosMappings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-dscp-to-cos-mappings
+    name: Cisco Meraki documentation for switch getNetworkSwitchDscpToCosMappings
+short_description: Information module for networks _switch _dscp _to _cos _mappings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _dscp _to _cos _mappings
   cisco.meraki.networks_switch_dscp_to_cos_mappings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_link_aggregations.py b/plugins/modules/networks_switch_link_aggregations.py
index c099c2738..4c744e43e 100644
--- a/plugins/modules/networks_switch_link_aggregations.py
+++ b/plugins/modules/networks_switch_link_aggregations.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_link_aggregations
-short_description: Resource module for networks _switch _link _aggregations
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _link _aggregations.
-- Create a link aggregation group.
-- Split a link aggregation group into separate ports.
-- Update a link aggregation group.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _link
+    _aggregations.
+  - Create a link aggregation group.
+  - Split a link aggregation group into separate ports.
+  - Update a link aggregation group.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_link_aggregations
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_link_aggregation, switch.Switch.delete_network_switch_link_aggregation,
+    switch.Switch.update_network_switch_link_aggregation,
+  - Paths used are post /networks/{networkId}/switch/linkAggregations, delete /networks/{networkId}/switch/linkAggregations/{linkAggregationId},
+    put /networks/{networkId}/switch/linkAggregations/{linkAggregationId},
 options:
   linkAggregationId:
     description: LinkAggregationId path parameter. Link aggregation ID.
@@ -53,120 +56,109 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchLinkAggregation
-  description: Complete reference of the createNetworkSwitchLinkAggregation API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-link-aggregation
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchLinkAggregation
-  description: Complete reference of the deleteNetworkSwitchLinkAggregation API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-link-aggregation
-- name: Cisco Meraki documentation for switch updateNetworkSwitchLinkAggregation
-  description: Complete reference of the updateNetworkSwitchLinkAggregation API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-link-aggregation
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_link_aggregation,
-    switch.Switch.delete_network_switch_link_aggregation,
-    switch.Switch.update_network_switch_link_aggregation,
-
-  - Paths used are
-    post /networks/{networkId}/switch/linkAggregations,
-    delete /networks/{networkId}/switch/linkAggregations/{linkAggregationId},
-    put /networks/{networkId}/switch/linkAggregations/{linkAggregationId},
+  - description: Complete reference of the createNetworkSwitchLinkAggregation API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-link-aggregation
+    name: Cisco Meraki documentation for switch createNetworkSwitchLinkAggregation
+  - description: Complete reference of the deleteNetworkSwitchLinkAggregation API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-link-aggregation
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchLinkAggregation
+  - description: Complete reference of the updateNetworkSwitchLinkAggregation API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-link-aggregation
+    name: Cisco Meraki documentation for switch updateNetworkSwitchLinkAggregation
+short_description: Resource module for networks _switch _link _aggregations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_link_aggregations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     switchPorts:
-    - portId: '1'
-      serial: Q234-ABCD-0001
+      - portId: '1'
+        serial: Q234-ABCD-0001
     switchProfilePorts:
-    - portId: '2'
-      profile: '1234'
-
+      - portId: '2'
+        profile: '1234'
 - name: Delete by id
   cisco.meraki.networks_switch_link_aggregations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     linkAggregationId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_link_aggregations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     linkAggregationId: string
     networkId: string
     switchPorts:
-    - portId: '1'
-      serial: Q234-ABCD-0001
+      - portId: '1'
+        serial: Q234-ABCD-0001
     switchProfilePorts:
-    - portId: '2'
-      profile: '1234'
-
+      - portId: '2'
+        profile: '1234'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_link_aggregations_info.py b/plugins/modules/networks_switch_link_aggregations_info.py
index 29e4c23b0..8b0f3527a 100644
--- a/plugins/modules/networks_switch_link_aggregations_info.py
+++ b/plugins/modules/networks_switch_link_aggregations_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_link_aggregations_info
-short_description: Information module for networks _switch _link _aggregations
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _link _aggregations.
-- List link aggregation groups.
-version_added: '2.16.0'
+  - Get all networks _switch _link _aggregations.
+  - List link aggregation groups.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_link_aggregations_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_link_aggregations,
+  - Paths used are get /networks/{networkId}/switch/linkAggregations,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchLinkAggregations
-  description: Complete reference of the getNetworkSwitchLinkAggregations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-link-aggregations
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_link_aggregations,
-
-  - Paths used are
-    get /networks/{networkId}/switch/linkAggregations,
+  - description: Complete reference of the getNetworkSwitchLinkAggregations API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-link-aggregations
+    name: Cisco Meraki documentation for switch getNetworkSwitchLinkAggregations
+short_description: Information module for networks _switch _link _aggregations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _link _aggregations
   cisco.meraki.networks_switch_link_aggregations_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_mtu.py b/plugins/modules/networks_switch_mtu.py
index 8fe2c5e17..200a23fd8 100644
--- a/plugins/modules/networks_switch_mtu.py
+++ b/plugins/modules/networks_switch_mtu.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_mtu
-short_description: Resource module for networks _switch _mtu
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _mtu.
-- Update the MTU configuration.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _mtu.
+  - Update the MTU configuration.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_mtu
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_mtu,
+  - Paths used are put /networks/{networkId}/switch/mtu,
 options:
   defaultMtuSize:
     description: MTU size for the entire network. Default value is 9578.
@@ -23,8 +23,8 @@
     description: NetworkId path parameter. Network ID.
     type: str
   overrides:
-    description: Override MTU size for individual switches or switch templates. An empty
-      array will clear overrides.
+    description: Override MTU size for individual switches or switch templates. An
+      empty array will clear overrides.
     elements: dict
     suboptions:
       mtuSize:
@@ -40,56 +40,51 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchMtu
-  description: Complete reference of the updateNetworkSwitchMtu API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-mtu
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_mtu,
-
-  - Paths used are
-    put /networks/{networkId}/switch/mtu,
+  - description: Complete reference of the updateNetworkSwitchMtu API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-mtu
+    name: Cisco Meraki documentation for switch updateNetworkSwitchMtu
+short_description: Resource module for networks _switch _mtu
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_mtu:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultMtuSize: 9578
     networkId: string
     overrides:
-    - mtuSize: 1500
-      switchProfiles:
-      - '1284392014819'
-      - '2983092129865'
-      switches:
-      - Q234-ABCD-0001
-      - Q234-ABCD-0002
-      - Q234-ABCD-0003
-
+      - mtuSize: 1500
+        switchProfiles:
+          - '1284392014819'
+          - '2983092129865'
+        switches:
+          - Q234-ABCD-0001
+          - Q234-ABCD-0002
+          - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_mtu_info.py b/plugins/modules/networks_switch_mtu_info.py
index b037ff64b..b95771825 100644
--- a/plugins/modules/networks_switch_mtu_info.py
+++ b/plugins/modules/networks_switch_mtu_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_mtu_info
-short_description: Information module for networks _switch _mtu
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _mtu.
-- Return the MTU configuration.
-version_added: '2.16.0'
+  - Get all networks _switch _mtu.
+  - Return the MTU configuration.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_mtu_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_mtu,
+  - Paths used are get /networks/{networkId}/switch/mtu,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchMtu
-  description: Complete reference of the getNetworkSwitchMtu API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-mtu
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_mtu,
-
-  - Paths used are
-    get /networks/{networkId}/switch/mtu,
+  - description: Complete reference of the getNetworkSwitchMtu API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-mtu
+    name: Cisco Meraki documentation for switch getNetworkSwitchMtu
+short_description: Information module for networks _switch _mtu
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _mtu
   cisco.meraki.networks_switch_mtu_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_port_schedules.py b/plugins/modules/networks_switch_port_schedules.py
index 05e94233a..61ba47ab2 100644
--- a/plugins/modules/networks_switch_port_schedules.py
+++ b/plugins/modules/networks_switch_port_schedules.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_port_schedules
-short_description: Resource module for networks _switch _port _schedules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _port _schedules.
-- Add a switch port schedule.
-- Delete a switch port schedule.
-- Update a switch port schedule.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _port
+    _schedules.
+  - Add a switch port schedule.
+  - Delete a switch port schedule.
+  - Update a switch port schedule.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_port_schedules
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_port_schedule, switch.Switch.delete_network_switch_port_schedule,
+    switch.Switch.update_network_switch_port_schedule,
+  - Paths used are post /networks/{networkId}/switch/portSchedules, delete /networks/{networkId}/switch/portSchedules/{portScheduleId},
+    put /networks/{networkId}/switch/portSchedules/{portScheduleId},
 options:
   name:
     description: The name for your port schedule. Required.
@@ -25,22 +28,22 @@
     description: NetworkId path parameter. Network ID.
     type: str
   portSchedule:
-    description: The schedule for switch port scheduling. Schedules are applied to days
-      of the week. When it's empty, default schedule with all days of a week are configured.
-      Any unspecified day in the schedule is added as a default schedule configuration
-      of the day.
+    description: The schedule for switch port scheduling. Schedules are applied to
+      days of the week. When it's empty, default schedule with all days of a week
+      are configured. Any unspecified day in the schedule is added as a default schedule
+      configuration of the day.
     suboptions:
       friday:
         description: The schedule object for Friday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -52,13 +55,13 @@
         description: The schedule object for Monday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -70,13 +73,13 @@
         description: The schedule object for Saturday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -88,13 +91,13 @@
         description: The schedule object for Sunday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -106,13 +109,13 @@
         description: The schedule object for Thursday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -124,13 +127,13 @@
         description: The schedule object for Tuesday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -142,13 +145,13 @@
         description: The schedule object for Wednesday.
         suboptions:
           active:
-            description: Whether the schedule is active (true) or inactive (false) during
-              the time specified between 'from' and 'to'. Defaults to true.
+            description: Whether the schedule is active (true) or inactive (false)
+              during the time specified between 'from' and 'to'. Defaults to true.
             type: bool
           from:
-            description: The time, from '00 00' to '24 00'. Must be less than the time
-              specified in 'to'. Defaults to '00 00'. Only 30 minute increments are
-              allowed.
+            description: The time, from '00 00' to '24 00'. Must be less than the
+              time specified in 'to'. Defaults to '00 00'. Only 30 minute increments
+              are allowed.
             type: str
           to:
             description: The time, from '00 00' to '24 00'. Must be greater than the
@@ -161,53 +164,45 @@
     description: PortScheduleId path parameter. Port schedule ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchPortSchedule
-  description: Complete reference of the createNetworkSwitchPortSchedule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-port-schedule
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchPortSchedule
-  description: Complete reference of the deleteNetworkSwitchPortSchedule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-port-schedule
-- name: Cisco Meraki documentation for switch updateNetworkSwitchPortSchedule
-  description: Complete reference of the updateNetworkSwitchPortSchedule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-port-schedule
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_port_schedule,
-    switch.Switch.delete_network_switch_port_schedule,
-    switch.Switch.update_network_switch_port_schedule,
-
-  - Paths used are
-    post /networks/{networkId}/switch/portSchedules,
-    delete /networks/{networkId}/switch/portSchedules/{portScheduleId},
-    put /networks/{networkId}/switch/portSchedules/{portScheduleId},
+  - description: Complete reference of the createNetworkSwitchPortSchedule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-port-schedule
+    name: Cisco Meraki documentation for switch createNetworkSwitchPortSchedule
+  - description: Complete reference of the deleteNetworkSwitchPortSchedule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-port-schedule
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchPortSchedule
+  - description: Complete reference of the updateNetworkSwitchPortSchedule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-port-schedule
+    name: Cisco Meraki documentation for switch updateNetworkSwitchPortSchedule
+short_description: Resource module for networks _switch _port _schedules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_port_schedules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Weekdays schedule
     networkId: string
@@ -240,55 +235,53 @@
         active: true
         from: '9:00'
         to: '17:00'
-
 - name: Delete by id
   cisco.meraki.networks_switch_port_schedules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     portScheduleId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_port_schedules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Weekdays schedule
     networkId: string
@@ -322,7 +315,6 @@
         from: '9:00'
         to: '17:00'
     portScheduleId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_port_schedules_info.py b/plugins/modules/networks_switch_port_schedules_info.py
index 75594e3ca..d9d953fd1 100644
--- a/plugins/modules/networks_switch_port_schedules_info.py
+++ b/plugins/modules/networks_switch_port_schedules_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_port_schedules_info
-short_description: Information module for networks _switch _port _schedules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _port _schedules.
-- List switch port schedules.
-version_added: '2.16.0'
+  - Get all networks _switch _port _schedules.
+  - List switch port schedules.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_port_schedules_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_port_schedules,
+  - Paths used are get /networks/{networkId}/switch/portSchedules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchPortSchedules
-  description: Complete reference of the getNetworkSwitchPortSchedules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-port-schedules
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_port_schedules,
-
-  - Paths used are
-    get /networks/{networkId}/switch/portSchedules,
+  - description: Complete reference of the getNetworkSwitchPortSchedules API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-port-schedules
+    name: Cisco Meraki documentation for switch getNetworkSwitchPortSchedules
+short_description: Information module for networks _switch _port _schedules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _port _schedules
   cisco.meraki.networks_switch_port_schedules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_qos_rules_order.py b/plugins/modules/networks_switch_qos_rules_order.py
index 3c92827dd..abe21b185 100644
--- a/plugins/modules/networks_switch_qos_rules_order.py
+++ b/plugins/modules/networks_switch_qos_rules_order.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_qos_rules_order
-short_description: Resource module for networks _switch _qos _rules _order
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _qos _rules _order.
-- Add a quality of service rule.
-- Delete a quality of service rule.
-- Update a quality of service rule.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _qos
+    _rules _order.
+  - Add a quality of service rule.
+  - Delete a quality of service rule.
+  - Update a quality of service rule.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_qos_rules_order
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_qos_rule, switch.Switch.delete_network_switch_qos_rule,
+    switch.Switch.update_network_switch_qos_rule,
+  - Paths used are post /networks/{networkId}/switch/qosRules, delete /networks/{networkId}/switch/qosRules/{qosRuleId},
+    put /networks/{networkId}/switch/qosRules/{qosRuleId},
 options:
   dscp:
     description: DSCP tag for the incoming packet. Set this to -1 to trust incoming
@@ -44,60 +47,52 @@
       is TCP or UDP.
     type: int
   srcPortRange:
-    description: The source port range of the incoming packet. Applicable only if protocol
-      is set to TCP or UDP.
+    description: The source port range of the incoming packet. Applicable only if
+      protocol is set to TCP or UDP.
     type: str
   vlan:
     description: The VLAN of the incoming packet. A null value will match any VLAN.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchQosRule
-  description: Complete reference of the createNetworkSwitchQosRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-qos-rule
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchQosRule
-  description: Complete reference of the deleteNetworkSwitchQosRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-qos-rule
-- name: Cisco Meraki documentation for switch updateNetworkSwitchQosRule
-  description: Complete reference of the updateNetworkSwitchQosRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-qos-rule
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_qos_rule,
-    switch.Switch.delete_network_switch_qos_rule,
-    switch.Switch.update_network_switch_qos_rule,
-
-  - Paths used are
-    post /networks/{networkId}/switch/qosRules,
-    delete /networks/{networkId}/switch/qosRules/{qosRuleId},
-    put /networks/{networkId}/switch/qosRules/{qosRuleId},
+  - description: Complete reference of the createNetworkSwitchQosRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-qos-rule
+    name: Cisco Meraki documentation for switch createNetworkSwitchQosRule
+  - description: Complete reference of the deleteNetworkSwitchQosRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-qos-rule
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchQosRule
+  - description: Complete reference of the updateNetworkSwitchQosRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-qos-rule
+    name: Cisco Meraki documentation for switch updateNetworkSwitchQosRule
+short_description: Resource module for networks _switch _qos _rules _order
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_qos_rules_order:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     dscp: 0
     dstPort: 3000
@@ -107,55 +102,53 @@
     srcPort: 2000
     srcPortRange: 70-80
     vlan: 100
-
 - name: Delete by id
   cisco.meraki.networks_switch_qos_rules_order:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     qosRuleId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_qos_rules_order:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     dscp: 0
     dstPort: 3000
@@ -166,7 +159,6 @@
     srcPort: 2000
     srcPortRange: 70-80
     vlan: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_qos_rules_order_info.py b/plugins/modules/networks_switch_qos_rules_order_info.py
index b471205d5..9a767b38d 100644
--- a/plugins/modules/networks_switch_qos_rules_order_info.py
+++ b/plugins/modules/networks_switch_qos_rules_order_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_qos_rules_order_info
-short_description: Information module for networks _switch _qos _rules _order
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _qos _rules _order.
-- Get networks _switch _qos _rules _order by id.
-- List quality of service rules.
-- Return a quality of service rule.
-version_added: '2.16.0'
+  - Get all networks _switch _qos _rules _order.
+  - Get networks _switch _qos _rules _order by id.
+  - List quality of service rules.
+  - Return a quality of service rule.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_qos_rules_order_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_qos_rule, switch.Switch.get_network_switch_qos_rules,
+  - Paths used are get /networks/{networkId}/switch/qosRules, get /networks/{networkId}/switch/qosRules/{qosRuleId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   qosRuleId:
     description:
-    - QosRuleId path parameter. Qos rule ID.
+      - QosRuleId path parameter. Qos rule ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchQosRule
-  description: Complete reference of the getNetworkSwitchQosRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-qos-rule
-- name: Cisco Meraki documentation for switch getNetworkSwitchQosRules
-  description: Complete reference of the getNetworkSwitchQosRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-qos-rules
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_qos_rule,
-    switch.Switch.get_network_switch_qos_rules,
-
-  - Paths used are
-    get /networks/{networkId}/switch/qosRules,
-    get /networks/{networkId}/switch/qosRules/{qosRuleId},
+  - description: Complete reference of the getNetworkSwitchQosRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-qos-rule
+    name: Cisco Meraki documentation for switch getNetworkSwitchQosRule
+  - description: Complete reference of the getNetworkSwitchQosRules API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-qos-rules
+    name: Cisco Meraki documentation for switch getNetworkSwitchQosRules
+short_description: Information module for networks _switch _qos _rules _order
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _qos _rules _order
   cisco.meraki.networks_switch_qos_rules_order_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _switch _qos _rules _order by id
   cisco.meraki.networks_switch_qos_rules_order_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     qosRuleId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_multicast.py b/plugins/modules/networks_switch_routing_multicast.py
index 2169b2ee9..3e866e9a3 100644
--- a/plugins/modules/networks_switch_routing_multicast.py
+++ b/plugins/modules/networks_switch_routing_multicast.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_multicast
-short_description: Resource module for networks _switch _routing _multicast
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _routing _multicast.
-- Update multicast settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _routing _multicast.
+  - Update multicast settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_multicast
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_routing_multicast,
+  - Paths used are put /networks/{networkId}/switch/routing/multicast,
 options:
   defaultSettings:
     description: Default multicast setting for entire network. IGMP snooping and Flood
@@ -36,8 +36,8 @@
     elements: dict
     suboptions:
       floodUnknownMulticastTrafficEnabled:
-        description: Flood unknown multicast traffic setting for switches, switch stacks
-          or switch templates.
+        description: Flood unknown multicast traffic setting for switches, switch
+          stacks or switch templates.
         type: bool
       igmpSnoopingEnabled:
         description: IGMP snooping setting for switches, switch stacks or switch templates.
@@ -56,63 +56,58 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingMulticast
-  description: Complete reference of the updateNetworkSwitchRoutingMulticast API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-multicast
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_routing_multicast,
-
-  - Paths used are
-    put /networks/{networkId}/switch/routing/multicast,
+  - description: Complete reference of the updateNetworkSwitchRoutingMulticast API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-multicast
+    name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingMulticast
+short_description: Resource module for networks _switch _routing _multicast
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_routing_multicast:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultSettings:
       floodUnknownMulticastTrafficEnabled: true
       igmpSnoopingEnabled: true
     networkId: string
     overrides:
-    - floodUnknownMulticastTrafficEnabled: true
-      igmpSnoopingEnabled: true
-      stacks:
-      - '789102'
-      - '123456'
-      - '129102'
-      switchProfiles:
-      - '1234'
-      - '4567'
-      switches:
-      - Q234-ABCD-0001
-      - Q234-ABCD-0002
-      - Q234-ABCD-0003
-
+      - floodUnknownMulticastTrafficEnabled: true
+        igmpSnoopingEnabled: true
+        stacks:
+          - '789102'
+          - '123456'
+          - '129102'
+        switchProfiles:
+          - '1234'
+          - '4567'
+        switches:
+          - Q234-ABCD-0001
+          - Q234-ABCD-0002
+          - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_multicast_info.py b/plugins/modules/networks_switch_routing_multicast_info.py
index a2b220be0..4baa3b4aa 100644
--- a/plugins/modules/networks_switch_routing_multicast_info.py
+++ b/plugins/modules/networks_switch_routing_multicast_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_multicast_info
-short_description: Information module for networks _switch _routing _multicast
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _routing _multicast.
-- Return multicast settings for a network.
-version_added: '2.16.0'
+  - Get all networks _switch _routing _multicast.
+  - Return multicast settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_multicast_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_routing_multicast,
+  - Paths used are get /networks/{networkId}/switch/routing/multicast,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticast
-  description: Complete reference of the getNetworkSwitchRoutingMulticast API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_routing_multicast,
-
-  - Paths used are
-    get /networks/{networkId}/switch/routing/multicast,
+  - description: Complete reference of the getNetworkSwitchRoutingMulticast API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast
+    name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticast
+short_description: Information module for networks _switch _routing _multicast
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _routing _multicast
   cisco.meraki.networks_switch_routing_multicast_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_multicast_rendezvous_points.py b/plugins/modules/networks_switch_routing_multicast_rendezvous_points.py
index 724afdf80..b6073dd7e 100644
--- a/plugins/modules/networks_switch_routing_multicast_rendezvous_points.py
+++ b/plugins/modules/networks_switch_routing_multicast_rendezvous_points.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_multicast_rendezvous_points
-short_description: Resource module for networks _switch _routing _multicast _rendezvous _points
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _routing _multicast _rendezvous _points.
-- Create a multicast rendezvous point.
-- Delete a multicast rendezvous point.
-- Update a multicast rendezvous point.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _routing
+    _multicast _rendezvous _points.
+  - Create a multicast rendezvous point.
+  - Delete a multicast rendezvous point.
+  - Update a multicast rendezvous point.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_multicast_rendezvous_points
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_routing_multicast_rendezvous_point,
+    switch.Switch.delete_network_switch_routing_multicast_rendezvous_point, switch.Switch.update_network_switch_routing_multicast_rendezvous_point,
+  - Paths used are post /networks/{networkId}/switch/routing/multicast/rendezvousPoints,
+    delete /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
+    put /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
 options:
   interfaceIp:
     description: "The\_IP address of the interface where the RP needs to be created."
@@ -31,112 +35,105 @@
     description: RendezvousPointId path parameter. Rendezvous point ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchRoutingMulticastRendezvousPoint
-  description: Complete reference of the createNetworkSwitchRoutingMulticastRendezvousPoint API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-routing-multicast-rendezvous-point
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchRoutingMulticastRendezvousPoint
-  description: Complete reference of the deleteNetworkSwitchRoutingMulticastRendezvousPoint API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-routing-multicast-rendezvous-point
-- name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingMulticastRendezvousPoint
-  description: Complete reference of the updateNetworkSwitchRoutingMulticastRendezvousPoint API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-multicast-rendezvous-point
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_routing_multicast_rendezvous_point,
-    switch.Switch.delete_network_switch_routing_multicast_rendezvous_point,
-    switch.Switch.update_network_switch_routing_multicast_rendezvous_point,
-
-  - Paths used are
-    post /networks/{networkId}/switch/routing/multicast/rendezvousPoints,
-    delete /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
-    put /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
+  - description: Complete reference of the createNetworkSwitchRoutingMulticastRendezvousPoint
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-routing-multicast-rendezvous-point
+    name: Cisco Meraki documentation for switch createNetworkSwitchRoutingMulticastRendezvousPoint
+  - description: Complete reference of the deleteNetworkSwitchRoutingMulticastRendezvousPoint
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-routing-multicast-rendezvous-point
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchRoutingMulticastRendezvousPoint
+  - description: Complete reference of the updateNetworkSwitchRoutingMulticastRendezvousPoint
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-multicast-rendezvous-point
+    name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingMulticastRendezvousPoint
+short_description: Resource module for networks _switch _routing _multicast _rendezvous
+  _points
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_routing_multicast_rendezvous_points:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     interfaceIp: 192.168.1.2
     multicastGroup: Any
     networkId: string
-
 - name: Delete by id
   cisco.meraki.networks_switch_routing_multicast_rendezvous_points:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     rendezvousPointId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_routing_multicast_rendezvous_points:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     interfaceIp: 192.168.1.2
     multicastGroup: Any
     networkId: string
     rendezvousPointId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_multicast_rendezvous_points_info.py b/plugins/modules/networks_switch_routing_multicast_rendezvous_points_info.py
index ca58b57b0..e3a9b6133 100644
--- a/plugins/modules/networks_switch_routing_multicast_rendezvous_points_info.py
+++ b/plugins/modules/networks_switch_routing_multicast_rendezvous_points_info.py
@@ -5,102 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_multicast_rendezvous_points_info
-short_description: Information module for networks _switch _routing _multicast _rendezvous _points
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _routing _multicast _rendezvous _points.
-- Get networks _switch _routing _multicast _rendezvous _points by id.
-- List multicast rendezvous points.
-- Return a multicast rendezvous point.
-version_added: '2.16.0'
+  - Get all networks _switch _routing _multicast _rendezvous _points.
+  - Get networks _switch _routing _multicast _rendezvous _points by id.
+  - List multicast rendezvous points.
+  - Return a multicast rendezvous point.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_multicast_rendezvous_points_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_routing_multicast_rendezvous_point,
+    switch.Switch.get_network_switch_routing_multicast_rendezvous_points,
+  - Paths used are get /networks/{networkId}/switch/routing/multicast/rendezvousPoints,
+    get /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   rendezvousPointId:
     description:
-    - RendezvousPointId path parameter. Rendezvous point ID.
+      - RendezvousPointId path parameter. Rendezvous point ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticastRendezvousPoint
-  description: Complete reference of the getNetworkSwitchRoutingMulticastRendezvousPoint API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast-rendezvous-point
-- name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticastRendezvousPoints
-  description: Complete reference of the getNetworkSwitchRoutingMulticastRendezvousPoints API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast-rendezvous-points
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_routing_multicast_rendezvous_point,
-    switch.Switch.get_network_switch_routing_multicast_rendezvous_points,
-
-  - Paths used are
-    get /networks/{networkId}/switch/routing/multicast/rendezvousPoints,
-    get /networks/{networkId}/switch/routing/multicast/rendezvousPoints/{rendezvousPointId},
+  - description: Complete reference of the getNetworkSwitchRoutingMulticastRendezvousPoint
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast-rendezvous-point
+    name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticastRendezvousPoint
+  - description: Complete reference of the getNetworkSwitchRoutingMulticastRendezvousPoints
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-multicast-rendezvous-points
+    name: Cisco Meraki documentation for switch getNetworkSwitchRoutingMulticastRendezvousPoints
+short_description: Information module for networks _switch _routing _multicast _rendezvous
+  _points
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _routing _multicast _rendezvous _points
   cisco.meraki.networks_switch_routing_multicast_rendezvous_points_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _switch _routing _multicast _rendezvous _points by id
   cisco.meraki.networks_switch_routing_multicast_rendezvous_points_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     rendezvousPointId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_ospf.py b/plugins/modules/networks_switch_routing_ospf.py
index 1f168dd5e..7c76a4983 100644
--- a/plugins/modules/networks_switch_routing_ospf.py
+++ b/plugins/modules/networks_switch_routing_ospf.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_ospf
-short_description: Resource module for networks _switch _routing _ospf
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _routing _ospf.
-- Update layer 3 OSPF routing configuration.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _routing _ospf.
+  - Update layer 3 OSPF routing configuration.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_ospf
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_routing_ospf,
+  - Paths used are put /networks/{networkId}/switch/routing/ospf,
 options:
   areas:
     description: OSPF areas.
@@ -35,13 +35,13 @@
       Value must be between 1 and 65535.
     type: int
   enabled:
-    description: Boolean value to enable or disable OSPF routing. OSPF routing is disabled
-      by default.
+    description: Boolean value to enable or disable OSPF routing. OSPF routing is
+      disabled by default.
     type: bool
   helloTimerInSeconds:
     description: Time interval in seconds at which hello packet will be sent to OSPF
-      neighbors to maintain connectivity. Value must be between 1 and 255. Default is
-      10 seconds.
+      neighbors to maintain connectivity. Value must be between 1 and 255. Default
+      is 10 seconds.
     type: int
   md5AuthenticationEnabled:
     description: Boolean value to enable or disable MD5 authentication. MD5 authentication
@@ -52,7 +52,8 @@
       is true.
     suboptions:
       id:
-        description: MD5 authentication key index. Key index must be between 1 to 255.
+        description: MD5 authentication key index. Key index must be between 1 to
+          255.
         type: int
       passphrase:
         description: MD5 authentication passphrase.
@@ -93,48 +94,44 @@
         type: int
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingOspf
-  description: Complete reference of the updateNetworkSwitchRoutingOspf API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-ospf
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_routing_ospf,
-
-  - Paths used are
-    put /networks/{networkId}/switch/routing/ospf,
+  - description: Complete reference of the updateNetworkSwitchRoutingOspf API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-routing-ospf
+    name: Cisco Meraki documentation for switch updateNetworkSwitchRoutingOspf
+short_description: Resource module for networks _switch _routing _ospf
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_routing_ospf:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     areas:
-    - areaId: '1284392014819'
-      areaName: Backbone
-      areaType: normal
+      - areaId: '1284392014819'
+        areaName: Backbone
+        areaType: normal
     deadTimerInSeconds: 40
     enabled: true
     helloTimerInSeconds: 10
@@ -145,13 +142,12 @@
     networkId: string
     v3:
       areas:
-      - areaId: '1284392014819'
-        areaName: V3 Backbone
-        areaType: normal
+        - areaId: '1284392014819'
+          areaName: V3 Backbone
+          areaType: normal
       deadTimerInSeconds: 40
       enabled: true
       helloTimerInSeconds: 10
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_routing_ospf_info.py b/plugins/modules/networks_switch_routing_ospf_info.py
index 4f42c51f8..891d4b78a 100644
--- a/plugins/modules/networks_switch_routing_ospf_info.py
+++ b/plugins/modules/networks_switch_routing_ospf_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_routing_ospf_info
-short_description: Information module for networks _switch _routing _ospf
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _routing _ospf.
-- Return layer 3 OSPF routing configuration.
-version_added: '2.16.0'
+  - Get all networks _switch _routing _ospf.
+  - Return layer 3 OSPF routing configuration.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_routing_ospf_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_routing_ospf,
+  - Paths used are get /networks/{networkId}/switch/routing/ospf,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchRoutingOspf
-  description: Complete reference of the getNetworkSwitchRoutingOspf API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-ospf
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_routing_ospf,
-
-  - Paths used are
-    get /networks/{networkId}/switch/routing/ospf,
+  - description: Complete reference of the getNetworkSwitchRoutingOspf API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-routing-ospf
+    name: Cisco Meraki documentation for switch getNetworkSwitchRoutingOspf
+short_description: Information module for networks _switch _routing _ospf
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _routing _ospf
   cisco.meraki.networks_switch_routing_ospf_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_settings.py b/plugins/modules/networks_switch_settings.py
index 239a875a1..dcfd06f53 100644
--- a/plugins/modules/networks_switch_settings.py
+++ b/plugins/modules/networks_switch_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_settings
-short_description: Resource module for networks _switch _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _settings.
-- Update switch network settings.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _settings.
+  - Update switch network settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_settings
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_settings,
+  - Paths used are put /networks/{networkId}/switch/settings,
 options:
   macBlocklist:
     description: MAC blocklist.
@@ -45,62 +45,57 @@
         type: bool
     type: dict
   useCombinedPower:
-    description: The use Combined Power as the default behavior of secondary power supplies
-      on supported devices.
+    description: The use Combined Power as the default behavior of secondary power
+      supplies on supported devices.
     type: bool
   vlan:
     description: Management VLAN.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchSettings
-  description: Complete reference of the updateNetworkSwitchSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-settings
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_settings,
-
-  - Paths used are
-    put /networks/{networkId}/switch/settings,
+  - description: Complete reference of the updateNetworkSwitchSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-settings
+    name: Cisco Meraki documentation for switch updateNetworkSwitchSettings
+short_description: Resource module for networks _switch _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     macBlocklist:
       enabled: true
     networkId: string
     powerExceptions:
-    - powerType: string
-      serial: string
+      - powerType: string
+        serial: string
     uplinkClientSampling:
       enabled: true
     useCombinedPower: true
     vlan: 0
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_settings_info.py b/plugins/modules/networks_switch_settings_info.py
index 3a34301fb..7fe0f4383 100644
--- a/plugins/modules/networks_switch_settings_info.py
+++ b/plugins/modules/networks_switch_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_settings_info
-short_description: Information module for networks _switch _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _settings.
-- Returns the switch network settings.
-version_added: '2.16.0'
+  - Get all networks _switch _settings.
+  - Returns the switch network settings.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_settings_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_settings,
+  - Paths used are get /networks/{networkId}/switch/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchSettings
-  description: Complete reference of the getNetworkSwitchSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-settings
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_settings,
-
-  - Paths used are
-    get /networks/{networkId}/switch/settings,
+  - description: Complete reference of the getNetworkSwitchSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-settings
+    name: Cisco Meraki documentation for switch getNetworkSwitchSettings
+short_description: Information module for networks _switch _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _settings
   cisco.meraki.networks_switch_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks.py b/plugins/modules/networks_switch_stacks.py
index 0bce9eb76..db0ddbea0 100644
--- a/plugins/modules/networks_switch_stacks.py
+++ b/plugins/modules/networks_switch_stacks.py
@@ -5,17 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks
-short_description: Resource module for networks _switch _stacks
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create and delete of the resource networks _switch _stacks.
-- Create a switch stack.
-- Delete a stack.
-version_added: '2.16.0'
+  - Manage operations create and delete of the resource networks _switch _stacks.
+  - Create a switch stack.
+  - Delete a stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_stack, switch.Switch.delete_network_switch_stack,
+  - Paths used are post /networks/{networkId}/switch/stacks, delete /networks/{networkId}/switch/stacks/{switchStackId},
 options:
   name:
     description: The name of the new stack.
@@ -31,81 +31,73 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchStack
-  description: Complete reference of the createNetworkSwitchStack API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchStack
-  description: Complete reference of the deleteNetworkSwitchStack API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_stack,
-    switch.Switch.delete_network_switch_stack,
-
-  - Paths used are
-    post /networks/{networkId}/switch/stacks,
-    delete /networks/{networkId}/switch/stacks/{switchStackId},
+  - description: Complete reference of the createNetworkSwitchStack API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack
+    name: Cisco Meraki documentation for switch createNetworkSwitchStack
+  - description: Complete reference of the deleteNetworkSwitchStack API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchStack
+short_description: Resource module for networks _switch _stacks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_stacks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: A cool stack
     networkId: string
     serials:
-    - QBZY-XWVU-TSRQ
-    - QBAB-CDEF-GHIJ
-
+      - QBZY-XWVU-TSRQ
+      - QBAB-CDEF-GHIJ
 - name: Delete by id
   cisco.meraki.networks_switch_stacks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     switchStackId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_add.py b/plugins/modules/networks_switch_stacks_add.py
index 07dd16767..dd34a47b9 100644
--- a/plugins/modules/networks_switch_stacks_add.py
+++ b/plugins/modules/networks_switch_stacks_add.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_add
-short_description: Resource module for networks _switch _stacks _add
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _switch _stacks _add.
-- Add a switch to a stack.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _switch _stacks _add.
+  - Add a switch to a stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_add
+notes:
+  - SDK Method used are switch.Switch.add_network_switch_stack,
+  - Paths used are post /networks/{networkId}/switch/stacks/{switchStackId}/add,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -26,47 +26,42 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch addNetworkSwitchStack
-  description: Complete reference of the addNetworkSwitchStack API.
-  link: https://developer.cisco.com/meraki/api-v1/#!add-network-switch-stack
-notes:
-  - SDK Method used are
-    switch.Switch.add_network_switch_stack,
-
-  - Paths used are
-    post /networks/{networkId}/switch/stacks/{switchStackId}/add,
+  - description: Complete reference of the addNetworkSwitchStack API.
+    link: https://developer.cisco.com/meraki/api-v1/#!add-network-switch-stack
+    name: Cisco Meraki documentation for switch addNetworkSwitchStack
+short_description: Resource module for networks _switch _stacks _add
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_stacks_add:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     serial: QBZY-XWVU-TSRQ
     switchStackId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_info.py b/plugins/modules/networks_switch_stacks_info.py
index 49307e3f7..e7423e632 100644
--- a/plugins/modules/networks_switch_stacks_info.py
+++ b/plugins/modules/networks_switch_stacks_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_info
-short_description: Information module for networks _switch _stacks
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _stacks.
-- Get networks _switch _stacks by id.
-- List the switch stacks in a network.
-- Show a switch stack.
-version_added: '2.16.0'
+  - Get all networks _switch _stacks.
+  - Get networks _switch _stacks by id.
+  - List the switch stacks in a network.
+  - Show a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_stack, switch.Switch.get_network_switch_stacks,
+  - Paths used are get /networks/{networkId}/switch/stacks, get /networks/{networkId}/switch/stacks/{switchStackId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   switchStackId:
     description:
-    - SwitchStackId path parameter. Switch stack ID.
+      - SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStack
-  description: Complete reference of the getNetworkSwitchStack API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack
-- name: Cisco Meraki documentation for switch getNetworkSwitchStacks
-  description: Complete reference of the getNetworkSwitchStacks API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stacks
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_stack,
-    switch.Switch.get_network_switch_stacks,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stacks,
-    get /networks/{networkId}/switch/stacks/{switchStackId},
+  - description: Complete reference of the getNetworkSwitchStack API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack
+    name: Cisco Meraki documentation for switch getNetworkSwitchStack
+  - description: Complete reference of the getNetworkSwitchStacks API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stacks
+    name: Cisco Meraki documentation for switch getNetworkSwitchStacks
+short_description: Information module for networks _switch _stacks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _stacks
   cisco.meraki.networks_switch_stacks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _switch _stacks by id
   cisco.meraki.networks_switch_stacks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_remove.py b/plugins/modules/networks_switch_stacks_remove.py
index a4d10023b..31e6973aa 100644
--- a/plugins/modules/networks_switch_stacks_remove.py
+++ b/plugins/modules/networks_switch_stacks_remove.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_remove
-short_description: Resource module for networks _switch _stacks _remove
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _switch _stacks _remove.
-- Remove a switch from a stack.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _switch _stacks _remove.
+  - Remove a switch from a stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_remove
+notes:
+  - SDK Method used are switch.Switch.remove_network_switch_stack,
+  - Paths used are post /networks/{networkId}/switch/stacks/{switchStackId}/remove,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -26,47 +26,42 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch removeNetworkSwitchStack
-  description: Complete reference of the removeNetworkSwitchStack API.
-  link: https://developer.cisco.com/meraki/api-v1/#!remove-network-switch-stack
-notes:
-  - SDK Method used are
-    switch.Switch.remove_network_switch_stack,
-
-  - Paths used are
-    post /networks/{networkId}/switch/stacks/{switchStackId}/remove,
+  - description: Complete reference of the removeNetworkSwitchStack API.
+    link: https://developer.cisco.com/meraki/api-v1/#!remove-network-switch-stack
+    name: Cisco Meraki documentation for switch removeNetworkSwitchStack
+short_description: Resource module for networks _switch _stacks _remove
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_stacks_remove:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     serial: QBZY-XWVU-TSRQ
     switchStackId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_interfaces.py b/plugins/modules/networks_switch_stacks_routing_interfaces.py
index 665fa0da9..c4a227457 100644
--- a/plugins/modules/networks_switch_stacks_routing_interfaces.py
+++ b/plugins/modules/networks_switch_stacks_routing_interfaces.py
@@ -5,48 +5,54 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_interfaces
-short_description: Resource module for networks _switch _stacks _routing _interfaces
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _stacks _routing _interfaces.
-- Create a layer 3 interface for a switch stack.
-- Delete a layer 3 interface from a switch stack.
-- Update a layer 3 interface for a switch stack.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _stacks
+    _routing _interfaces.
+  - Create a layer 3 interface for a switch stack.
+  - Delete a layer 3 interface from a switch stack.
+  - Update a layer 3 interface for a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_interfaces
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_stack_routing_interface,
+    switch.Switch.delete_network_switch_stack_routing_interface, switch.Switch.update_network_switch_stack_routing_interface,
+  - Paths used are post /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces,
+    delete /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
+    put /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
 options:
   defaultGateway:
     description: The next hop for any traffic that isn't going to a directly connected
-      subnet or over a static route. This IP address must exist in a subnet with a routed
-      interface.
+      subnet or over a static route. This IP address must exist in a subnet with a
+      routed interface.
     type: str
   interfaceId:
     description: InterfaceId path parameter. Interface ID.
     type: str
   interfaceIp:
-    description: The IP address this switch stack will use for layer 3 routing on this
-      VLAN or subnet. This cannot be the same as the switch's management IP.
+    description: The IP address this switch stack will use for layer 3 routing on
+      this VLAN or subnet. This cannot be the same as the switch's management IP.
     type: str
   ipv6:
     description: The IPv6 settings of the interface.
     suboptions:
       address:
-        description: The IPv6 address of the interface. Required if assignmentMode is
-          'static'. Must not be included if assignmentMode is 'eui-64'.
+        description: The IPv6 address of the interface. Required if assignmentMode
+          is 'static'. Must not be included if assignmentMode is 'eui-64'.
         type: str
       assignmentMode:
         description: The IPv6 assignment mode for the interface. Can be either 'eui-64'
           or 'static'.
         type: str
       gateway:
-        description: The IPv6 default gateway of the interface. Required if prefix is
-          defined and this is the first interface with IPv6 configured for the stack.
+        description: The IPv6 default gateway of the interface. Required if prefix
+          is defined and this is the first interface with IPv6 configured for the
+          stack.
         type: str
       prefix:
-        description: The IPv6 prefix of the interface. Required if IPv6 object is included.
+        description: The IPv6 prefix of the interface. Required if IPv6 object is
+          included.
         type: str
     type: dict
   multicastRouting:
@@ -83,56 +89,52 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
   vlanId:
-    description: The VLAN this routed interface is on. VLAN must be between 1 and 4094.
+    description: The VLAN this routed interface is on. VLAN must be between 1 and
+      4094.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchStackRoutingInterface
-  description: Complete reference of the createNetworkSwitchStackRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack-routing-interface
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchStackRoutingInterface
-  description: Complete reference of the deleteNetworkSwitchStackRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack-routing-interface
-- name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingInterface
-  description: Complete reference of the updateNetworkSwitchStackRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-interface
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_stack_routing_interface,
-    switch.Switch.delete_network_switch_stack_routing_interface,
-    switch.Switch.update_network_switch_stack_routing_interface,
-
-  - Paths used are
-    post /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces,
-    delete /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
-    put /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
+  - description: Complete reference of the createNetworkSwitchStackRoutingInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack-routing-interface
+    name: Cisco Meraki documentation for switch createNetworkSwitchStackRoutingInterface
+  - description: Complete reference of the deleteNetworkSwitchStackRoutingInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack-routing-interface
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchStackRoutingInterface
+  - description: Complete reference of the updateNetworkSwitchStackRoutingInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-interface
+    name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingInterface
+short_description: Resource module for networks _switch _stacks _routing _interfaces
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_stacks_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultGateway: 192.168.1.1
     interfaceIp: 192.168.1.2
@@ -151,56 +153,54 @@
     subnet: 192.168.1.0/24
     switchStackId: string
     vlanId: 100
-
 - name: Delete by id
   cisco.meraki.networks_switch_stacks_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     interfaceId: string
     networkId: string
     switchStackId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_stacks_routing_interfaces:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultGateway: 192.168.1.1
     interfaceId: string
@@ -220,7 +220,6 @@
     subnet: 192.168.1.0/24
     switchStackId: string
     vlanId: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp.py b/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp.py
index f2e12148b..f20510ea1 100644
--- a/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp.py
+++ b/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp.py
@@ -5,40 +5,42 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_interfaces_dhcp
-short_description: Resource module for networks _switch _stacks _routing _interfaces _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _stacks _routing _interfaces _dhcp.
-- Update a layer 3 interface DHCP configuration for a switch stack.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _stacks _routing _interfaces
+    _dhcp.
+  - Update a layer 3 interface DHCP configuration for a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_interfaces_dhcp
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_stack_routing_interface_dhcp,
+  - Paths used are put /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId}/dhcp,
 options:
   bootFileName:
-    description: The PXE boot server file name for the DHCP server running on the switch
-      stack interface.
+    description: The PXE boot server file name for the DHCP server running on the
+      switch stack interface.
     type: str
   bootNextServer:
-    description: The PXE boot server IP for the DHCP server running on the switch stack
-      interface.
+    description: The PXE boot server IP for the DHCP server running on the switch
+      stack interface.
     type: str
   bootOptionsEnabled:
-    description: Enable DHCP boot options to provide PXE boot options configs for the
-      dhcp server running on the switch stack interface.
+    description: Enable DHCP boot options to provide PXE boot options configs for
+      the dhcp server running on the switch stack interface.
     type: bool
   dhcpLeaseTime:
-    description: The DHCP lease time config for the dhcp server running on switch stack
-      interface ('30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1 week').
+    description: The DHCP lease time config for the dhcp server running on switch
+      stack interface ('30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1
+      week').
     type: str
   dhcpMode:
     description: The DHCP mode options for the switch stack interface ('dhcpDisabled',
       'dhcpRelay' or 'dhcpServer').
     type: str
   dhcpOptions:
-    description: Array of DHCP options consisting of code, type and value for the DHCP
-      server running on the switch stack interface.
+    description: Array of DHCP options consisting of code, type and value for the
+      DHCP server running on the switch stack interface.
     elements: dict
     suboptions:
       code:
@@ -53,8 +55,8 @@
         type: str
     type: list
   dhcpRelayServerIps:
-    description: The DHCP relay server IPs to which DHCP packets would get relayed for
-      the switch stack interface.
+    description: The DHCP relay server IPs to which DHCP packets would get relayed
+      for the switch stack interface.
     elements: str
     type: list
   dnsCustomNameservers:
@@ -66,8 +68,8 @@
       stack interface ('googlePublicDns', 'openDns' or 'custom').
     type: str
   fixedIpAssignments:
-    description: Array of DHCP fixed IP assignments for the DHCP server running on the
-      switch stack interface.
+    description: Array of DHCP fixed IP assignments for the DHCP server running on
+      the switch stack interface.
     elements: dict
     suboptions:
       ip:
@@ -88,8 +90,8 @@
     description: NetworkId path parameter. Network ID.
     type: str
   reservedIpRanges:
-    description: Array of DHCP reserved IP assignments for the DHCP server running on
-      the switch stack interface.
+    description: Array of DHCP reserved IP assignments for the DHCP server running
+      on the switch stack interface.
     elements: dict
     suboptions:
       comment:
@@ -106,43 +108,41 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingInterfaceDhcp
-  description: Complete reference of the updateNetworkSwitchStackRoutingInterfaceDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-interface-dhcp
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_stack_routing_interface_dhcp,
-
-  - Paths used are
-    put /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId}/dhcp,
+  - description: Complete reference of the updateNetworkSwitchStackRoutingInterfaceDhcp
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-interface-dhcp
+    name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingInterfaceDhcp
+short_description: Resource module for networks _switch _stacks _routing _interfaces
+  _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_stacks_routing_interfaces_dhcp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     bootFileName: home_boot_file
     bootNextServer: 1.2.3.4
@@ -150,26 +150,25 @@
     dhcpLeaseTime: 1 day
     dhcpMode: dhcpServer
     dhcpOptions:
-    - code: '5'
-      type: text
-      value: five
+      - code: '5'
+        type: text
+        value: five
     dhcpRelayServerIps:
-    - 1.2.3.4
+      - 1.2.3.4
     dnsCustomNameservers:
-    - 8.8.8.8, 8.8.4.4
+      - 8.8.8.8, 8.8.4.4
     dnsNameserversOption: custom
     fixedIpAssignments:
-    - ip: 192.168.1.12
-      mac: 22:33:44:55:66:77
-      name: Cisco Meraki valued client
+      - ip: 192.168.1.12
+        mac: 22:33:44:55:66:77
+        name: Cisco Meraki valued client
     interfaceId: string
     networkId: string
     reservedIpRanges:
-    - comment: A reserved IP range
-      end: 192.168.1.10
-      start: 192.168.1.1
+      - comment: A reserved IP range
+        end: 192.168.1.10
+        start: 192.168.1.1
     switchStackId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp_info.py b/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp_info.py
index 82e3ab21f..bf14e2563 100644
--- a/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp_info.py
+++ b/plugins/modules/networks_switch_stacks_routing_interfaces_dhcp_info.py
@@ -5,75 +5,72 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_interfaces_dhcp_info
-short_description: Information module for networks _switch _stacks _routing _interfaces _dhcp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _stacks _routing _interfaces _dhcp.
-- Return a layer 3 interface DHCP configuration for a switch stack.
-version_added: '2.16.0'
+  - Get all networks _switch _stacks _routing _interfaces _dhcp.
+  - Return a layer 3 interface DHCP configuration for a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_interfaces_dhcp_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_stack_routing_interface_dhcp,
+  - Paths used are get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId}/dhcp,
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  interfaceId:
     description:
-    - NetworkId path parameter. Network ID.
+      - InterfaceId path parameter. Interface ID.
     type: str
-  switchStackId:
+  networkId:
     description:
-    - SwitchStackId path parameter. Switch stack ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  interfaceId:
+  switchStackId:
     description:
-    - InterfaceId path parameter. Interface ID.
+      - SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterfaceDhcp
-  description: Complete reference of the getNetworkSwitchStackRoutingInterfaceDhcp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interface-dhcp
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_stack_routing_interface_dhcp,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId}/dhcp,
+  - description: Complete reference of the getNetworkSwitchStackRoutingInterfaceDhcp
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interface-dhcp
+    name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterfaceDhcp
+short_description: Information module for networks _switch _stacks _routing _interfaces
+  _dhcp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _stacks _routing _interfaces _dhcp
   cisco.meraki.networks_switch_stacks_routing_interfaces_dhcp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
     interfaceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_interfaces_info.py b/plugins/modules/networks_switch_stacks_routing_interfaces_info.py
index 34a8ccd7d..741f7cda8 100644
--- a/plugins/modules/networks_switch_stacks_routing_interfaces_info.py
+++ b/plugins/modules/networks_switch_stacks_routing_interfaces_info.py
@@ -5,108 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_interfaces_info
-short_description: Information module for networks _switch _stacks _routing _interfaces
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _stacks _routing _interfaces.
-- Get networks _switch _stacks _routing _interfaces by id.
-- List layer 3 interfaces for a switch stack.
-- Return a layer 3 interface from a switch stack.
-version_added: '2.16.0'
+  - Get all networks _switch _stacks _routing _interfaces.
+  - Get networks _switch _stacks _routing _interfaces by id.
+  - List layer 3 interfaces for a switch stack.
+  - Return a layer 3 interface from a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_interfaces_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_stack_routing_interface,
+    switch.Switch.get_network_switch_stack_routing_interfaces,
+  - Paths used are get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces,
+    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  interfaceId:
     description:
-    - NetworkId path parameter. Network ID.
+      - InterfaceId path parameter. Interface ID.
     type: str
-  switchStackId:
+  networkId:
     description:
-    - SwitchStackId path parameter. Switch stack ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  interfaceId:
+  switchStackId:
     description:
-    - InterfaceId path parameter. Interface ID.
+      - SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterface
-  description: Complete reference of the getNetworkSwitchStackRoutingInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interface
-- name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterfaces
-  description: Complete reference of the getNetworkSwitchStackRoutingInterfaces API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interfaces
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_stack_routing_interface,
-    switch.Switch.get_network_switch_stack_routing_interfaces,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces,
-    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/interfaces/{interfaceId},
+  - description: Complete reference of the getNetworkSwitchStackRoutingInterface API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interface
+    name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterface
+  - description: Complete reference of the getNetworkSwitchStackRoutingInterfaces
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-interfaces
+    name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingInterfaces
+short_description: Information module for networks _switch _stacks _routing _interfaces
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _stacks _routing _interfaces
   cisco.meraki.networks_switch_stacks_routing_interfaces_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
   register: result
-
 - name: Get networks _switch _stacks _routing _interfaces by id
   cisco.meraki.networks_switch_stacks_routing_interfaces_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
     interfaceId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_static_routes.py b/plugins/modules/networks_switch_stacks_routing_static_routes.py
index 2bd873ede..3e46cc755 100644
--- a/plugins/modules/networks_switch_stacks_routing_static_routes.py
+++ b/plugins/modules/networks_switch_stacks_routing_static_routes.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_static_routes
-short_description: Resource module for networks _switch _stacks _routing _static _routes
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _switch _stacks _routing _static _routes.
-- Create a layer 3 static route for a switch stack.
-- Delete a layer 3 static route for a switch stack.
-- Update a layer 3 static route for a switch stack.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _switch _stacks
+    _routing _static _routes.
+  - Create a layer 3 static route for a switch stack.
+  - Delete a layer 3 static route for a switch stack.
+  - Update a layer 3 static route for a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_static_routes
+notes:
+  - SDK Method used are switch.Switch.create_network_switch_stack_routing_static_route,
+    switch.Switch.delete_network_switch_stack_routing_static_route, switch.Switch.update_network_switch_stack_routing_static_route,
+  - Paths used are post /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes,
+    delete /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
+    put /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
 options:
   advertiseViaOspfEnabled:
     description: Option to advertise static route via OSPF.
@@ -48,53 +52,48 @@
     description: SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch createNetworkSwitchStackRoutingStaticRoute
-  description: Complete reference of the createNetworkSwitchStackRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack-routing-static-route
-- name: Cisco Meraki documentation for switch deleteNetworkSwitchStackRoutingStaticRoute
-  description: Complete reference of the deleteNetworkSwitchStackRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack-routing-static-route
-- name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingStaticRoute
-  description: Complete reference of the updateNetworkSwitchStackRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-static-route
-notes:
-  - SDK Method used are
-    switch.Switch.create_network_switch_stack_routing_static_route,
-    switch.Switch.delete_network_switch_stack_routing_static_route,
-    switch.Switch.update_network_switch_stack_routing_static_route,
-
-  - Paths used are
-    post /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes,
-    delete /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
-    put /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
+  - description: Complete reference of the createNetworkSwitchStackRoutingStaticRoute
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-switch-stack-routing-static-route
+    name: Cisco Meraki documentation for switch createNetworkSwitchStackRoutingStaticRoute
+  - description: Complete reference of the deleteNetworkSwitchStackRoutingStaticRoute
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-stack-routing-static-route
+    name: Cisco Meraki documentation for switch deleteNetworkSwitchStackRoutingStaticRoute
+  - description: Complete reference of the updateNetworkSwitchStackRoutingStaticRoute
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stack-routing-static-route
+    name: Cisco Meraki documentation for switch updateNetworkSwitchStackRoutingStaticRoute
+short_description: Resource module for networks _switch _stacks _routing _static _routes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_switch_stacks_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     advertiseViaOspfEnabled: false
     name: My route
@@ -103,56 +102,54 @@
     preferOverOspfRoutesEnabled: false
     subnet: 192.168.1.0/24
     switchStackId: string
-
 - name: Delete by id
   cisco.meraki.networks_switch_stacks_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     staticRouteId: string
     switchStackId: string
-
 - name: Update by id
   cisco.meraki.networks_switch_stacks_routing_static_routes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     advertiseViaOspfEnabled: false
     managementNextHop: 1.2.3.5
@@ -163,7 +160,6 @@
     staticRouteId: string
     subnet: 192.168.1.0/24
     switchStackId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stacks_routing_static_routes_info.py b/plugins/modules/networks_switch_stacks_routing_static_routes_info.py
index d80ef2f19..3354e1ca5 100644
--- a/plugins/modules/networks_switch_stacks_routing_static_routes_info.py
+++ b/plugins/modules/networks_switch_stacks_routing_static_routes_info.py
@@ -5,108 +5,105 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stacks_routing_static_routes_info
-short_description: Information module for networks _switch _stacks _routing _static _routes
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _stacks _routing _static _routes.
-- Get networks _switch _stacks _routing _static _routes by id.
-- List layer 3 static routes for a switch stack.
-- Return a layer 3 static route for a switch stack.
-version_added: '2.16.0'
+  - Get all networks _switch _stacks _routing _static _routes.
+  - Get networks _switch _stacks _routing _static _routes by id.
+  - List layer 3 static routes for a switch stack.
+  - Return a layer 3 static route for a switch stack.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stacks_routing_static_routes_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_stack_routing_static_route,
+    switch.Switch.get_network_switch_stack_routing_static_routes,
+  - Paths used are get /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes,
+    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  switchStackId:
+  staticRouteId:
     description:
-    - SwitchStackId path parameter. Switch stack ID.
+      - StaticRouteId path parameter. Static route ID.
     type: str
-  staticRouteId:
+  switchStackId:
     description:
-    - StaticRouteId path parameter. Static route ID.
+      - SwitchStackId path parameter. Switch stack ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingStaticRoute
-  description: Complete reference of the getNetworkSwitchStackRoutingStaticRoute API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-static-route
-- name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingStaticRoutes
-  description: Complete reference of the getNetworkSwitchStackRoutingStaticRoutes API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-static-routes
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_stack_routing_static_route,
-    switch.Switch.get_network_switch_stack_routing_static_routes,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes,
-    get /networks/{networkId}/switch/stacks/{switchStackId}/routing/staticRoutes/{staticRouteId},
+  - description: Complete reference of the getNetworkSwitchStackRoutingStaticRoute
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-static-route
+    name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingStaticRoute
+  - description: Complete reference of the getNetworkSwitchStackRoutingStaticRoutes
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stack-routing-static-routes
+    name: Cisco Meraki documentation for switch getNetworkSwitchStackRoutingStaticRoutes
+short_description: Information module for networks _switch _stacks _routing _static
+  _routes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _stacks _routing _static _routes
   cisco.meraki.networks_switch_stacks_routing_static_routes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
   register: result
-
 - name: Get networks _switch _stacks _routing _static _routes by id
   cisco.meraki.networks_switch_stacks_routing_static_routes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     switchStackId: string
     staticRouteId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_storm_control.py b/plugins/modules/networks_switch_storm_control.py
index 3bf5b66f3..05305963b 100644
--- a/plugins/modules/networks_switch_storm_control.py
+++ b/plugins/modules/networks_switch_storm_control.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_storm_control
-short_description: Resource module for networks _switch _storm _control
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _storm _control.
-- Update the storm control configuration for a switch network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _storm _control.
+  - Update the storm control configuration for a switch network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_storm_control
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_storm_control,
+  - Paths used are put /networks/{networkId}/switch/stormControl,
 options:
   broadcastThreshold:
     description: Percentage (1 to 99) of total available port bandwidth for broadcast
@@ -37,52 +37,47 @@
       rate is to clear the configuration.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchStormControl
-  description: Complete reference of the updateNetworkSwitchStormControl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-storm-control
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_storm_control,
-
-  - Paths used are
-    put /networks/{networkId}/switch/stormControl,
+  - description: Complete reference of the updateNetworkSwitchStormControl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-storm-control
+    name: Cisco Meraki documentation for switch updateNetworkSwitchStormControl
+short_description: Resource module for networks _switch _storm _control
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_storm_control:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     broadcastThreshold: 30
     multicastThreshold: 30
     networkId: string
     treatTheseTrafficTypesAsOneThreshold:
-    - broadcast
-    - multicast
+      - broadcast
+      - multicast
     unknownUnicastThreshold: 30
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_storm_control_info.py b/plugins/modules/networks_switch_storm_control_info.py
index 49eb185f6..dd7d33130 100644
--- a/plugins/modules/networks_switch_storm_control_info.py
+++ b/plugins/modules/networks_switch_storm_control_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_storm_control_info
-short_description: Information module for networks _switch _storm _control
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _storm _control.
-- Return the storm control configuration for a switch network.
-version_added: '2.16.0'
+  - Get all networks _switch _storm _control.
+  - Return the storm control configuration for a switch network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_storm_control_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_storm_control,
+  - Paths used are get /networks/{networkId}/switch/stormControl,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStormControl
-  description: Complete reference of the getNetworkSwitchStormControl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-storm-control
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_storm_control,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stormControl,
+  - description: Complete reference of the getNetworkSwitchStormControl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-storm-control
+    name: Cisco Meraki documentation for switch getNetworkSwitchStormControl
+short_description: Information module for networks _switch _storm _control
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _storm _control
   cisco.meraki.networks_switch_storm_control_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stp.py b/plugins/modules/networks_switch_stp.py
index 730c8f765..ee4373d76 100644
--- a/plugins/modules/networks_switch_stp.py
+++ b/plugins/modules/networks_switch_stp.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stp
-short_description: Resource module for networks _switch _stp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _switch _stp.
-- Updates STP settings.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _switch _stp.
+  - Updates STP settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stp
+notes:
+  - SDK Method used are switch.Switch.update_network_switch_stp,
+  - Paths used are put /networks/{networkId}/switch/stp,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -44,61 +44,56 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateNetworkSwitchStp
-  description: Complete reference of the updateNetworkSwitchStp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stp
-notes:
-  - SDK Method used are
-    switch.Switch.update_network_switch_stp,
-
-  - Paths used are
-    put /networks/{networkId}/switch/stp,
+  - description: Complete reference of the updateNetworkSwitchStp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-switch-stp
+    name: Cisco Meraki documentation for switch updateNetworkSwitchStp
+short_description: Resource module for networks _switch _stp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_switch_stp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     rstpEnabled: true
     stpBridgePriority:
-    - stacks:
-      - '789102'
-      - '123456'
-      - '129102'
-      stpPriority: 4096
-      switchProfiles:
-      - '1098'
-      - '1099'
-      - '1100'
-      switches:
-      - Q234-ABCD-0001
-      - Q234-ABCD-0002
-      - Q234-ABCD-0003
-
+      - stacks:
+          - '789102'
+          - '123456'
+          - '129102'
+        stpPriority: 4096
+        switchProfiles:
+          - '1098'
+          - '1099'
+          - '1100'
+        switches:
+          - Q234-ABCD-0001
+          - Q234-ABCD-0002
+          - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_switch_stp_info.py b/plugins/modules/networks_switch_stp_info.py
index fb9fb7935..5a37fe907 100644
--- a/plugins/modules/networks_switch_stp_info.py
+++ b/plugins/modules/networks_switch_stp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_switch_stp_info
-short_description: Information module for networks _switch _stp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _switch _stp.
-- Returns STP settings.
-version_added: '2.16.0'
+  - Get all networks _switch _stp.
+  - Returns STP settings.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_switch_stp_info
+notes:
+  - SDK Method used are switch.Switch.get_network_switch_stp,
+  - Paths used are get /networks/{networkId}/switch/stp,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getNetworkSwitchStp
-  description: Complete reference of the getNetworkSwitchStp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stp
-notes:
-  - SDK Method used are
-    switch.Switch.get_network_switch_stp,
-
-  - Paths used are
-    get /networks/{networkId}/switch/stp,
+  - description: Complete reference of the getNetworkSwitchStp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-switch-stp
+    name: Cisco Meraki documentation for switch getNetworkSwitchStp
+short_description: Information module for networks _switch _stp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _switch _stp
   cisco.meraki.networks_switch_stp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_syslog_servers.py b/plugins/modules/networks_syslog_servers.py
index cf624617d..13568ca6a 100644
--- a/plugins/modules/networks_syslog_servers.py
+++ b/plugins/modules/networks_syslog_servers.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_syslog_servers
-short_description: Resource module for networks _syslog _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _syslog _servers.
-- Update the syslog servers for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _syslog _servers.
+  - Update the syslog servers for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_syslog_servers
+notes:
+  - SDK Method used are networks.Networks.update_network_syslog_servers,
+  - Paths used are put /networks/{networkId}/syslogServers,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -37,52 +37,47 @@
         type: list
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkSyslogServers
-  description: Complete reference of the updateNetworkSyslogServers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-syslog-servers
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_syslog_servers,
-
-  - Paths used are
-    put /networks/{networkId}/syslogServers,
+  - description: Complete reference of the updateNetworkSyslogServers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-syslog-servers
+    name: Cisco Meraki documentation for networks updateNetworkSyslogServers
+short_description: Resource module for networks _syslog _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_syslog_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     servers:
-    - host: 1.2.3.4
-      port: 443
-      roles:
-      - Wireless event log
-      - URLs
-
+      - host: 1.2.3.4
+        port: 443
+        roles:
+          - Wireless event log
+          - URLs
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_syslog_servers_info.py b/plugins/modules/networks_syslog_servers_info.py
index 46e4fef71..947426b90 100644
--- a/plugins/modules/networks_syslog_servers_info.py
+++ b/plugins/modules/networks_syslog_servers_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_syslog_servers_info
-short_description: Information module for networks _syslog _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _syslog _servers.
-- List the syslog servers for a network.
-version_added: '2.16.0'
+  - Get all networks _syslog _servers.
+  - List the syslog servers for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_syslog_servers_info
+notes:
+  - SDK Method used are networks.Networks.get_network_syslog_servers,
+  - Paths used are get /networks/{networkId}/syslogServers,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkSyslogServers
-  description: Complete reference of the getNetworkSyslogServers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-syslog-servers
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_syslog_servers,
-
-  - Paths used are
-    get /networks/{networkId}/syslogServers,
+  - description: Complete reference of the getNetworkSyslogServers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-syslog-servers
+    name: Cisco Meraki documentation for networks getNetworkSyslogServers
+short_description: Information module for networks _syslog _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _syslog _servers
   cisco.meraki.networks_syslog_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_topology_link_layer_info.py b/plugins/modules/networks_topology_link_layer_info.py
index a84c2e358..ebad1dafe 100644
--- a/plugins/modules/networks_topology_link_layer_info.py
+++ b/plugins/modules/networks_topology_link_layer_info.py
@@ -5,67 +5,64 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_topology_link_layer_info
-short_description: Information module for networks _topology _link _layer
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _topology _link _layer.
-- >
-   List the LLDP and CDP information for all discovered devices and connections in a network. At least one MX or MS
-   device must be in the network in order to build the topology.
-version_added: '2.16.0'
+  - Get all networks _topology _link _layer.
+  - 'List the LLDP and CDP information for all discovered devices and connections
+    in a network. At least one MX or MS device must be in the network in order to
+    build the topology.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_topology_link_layer_info
+notes:
+  - SDK Method used are networks.Networks.get_network_topology_link_layer,
+  - Paths used are get /networks/{networkId}/topology/linkLayer,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkTopologyLinkLayer
-  description: Complete reference of the getNetworkTopologyLinkLayer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-topology-link-layer
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_topology_link_layer,
-
-  - Paths used are
-    get /networks/{networkId}/topology/linkLayer,
+  - description: Complete reference of the getNetworkTopologyLinkLayer API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-topology-link-layer
+    name: Cisco Meraki documentation for networks getNetworkTopologyLinkLayer
+short_description: Information module for networks _topology _link _layer
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _topology _link _layer
   cisco.meraki.networks_topology_link_layer_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_traffic_analysis.py b/plugins/modules/networks_traffic_analysis.py
index 25b477e47..13a40f49e 100644
--- a/plugins/modules/networks_traffic_analysis.py
+++ b/plugins/modules/networks_traffic_analysis.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_traffic_analysis
-short_description: Resource module for networks _traffic _analysis
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _traffic _analysis.
-- Update the traffic analysis settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _traffic _analysis.
+  - Update the traffic analysis settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_traffic_analysis
+notes:
+  - SDK Method used are networks.Networks.update_network_traffic_analysis,
+  - Paths used are put /networks/{networkId}/trafficAnalysis,
 options:
   customPieChartItems:
     description: The list of items that make up the custom pie chart for traffic reporting.
@@ -24,13 +24,13 @@
         description: The name of the custom pie chart item.
         type: str
       type:
-        description: The signature type for the custom pie chart item. Can be one of
-          'host', 'port' or 'ipRange'.
+        description: The signature type for the custom pie chart item. Can be one
+          of 'host', 'port' or 'ipRange'.
         type: str
       value:
-        description: The value of the custom pie chart item. Valid syntax depends on
-          the signature type of the chart item (see sample request/response for more
-          details).
+        description: The value of the custom pie chart item. Valid syntax depends
+          on the signature type of the chart item (see sample request/response for
+          more details).
         type: str
     type: list
   mode:
@@ -42,51 +42,46 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks updateNetworkTrafficAnalysis
-  description: Complete reference of the updateNetworkTrafficAnalysis API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-traffic-analysis
-notes:
-  - SDK Method used are
-    networks.Networks.update_network_traffic_analysis,
-
-  - Paths used are
-    put /networks/{networkId}/trafficAnalysis,
+  - description: Complete reference of the updateNetworkTrafficAnalysis API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-traffic-analysis
+    name: Cisco Meraki documentation for networks updateNetworkTrafficAnalysis
+short_description: Resource module for networks _traffic _analysis
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_traffic_analysis:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     customPieChartItems:
-    - name: Item from hostname
-      type: host
-      value: example.com
+      - name: Item from hostname
+        type: host
+        value: example.com
     mode: disabled
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_traffic_analysis_info.py b/plugins/modules/networks_traffic_analysis_info.py
index 97062db4d..835ff3796 100644
--- a/plugins/modules/networks_traffic_analysis_info.py
+++ b/plugins/modules/networks_traffic_analysis_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_traffic_analysis_info
-short_description: Information module for networks _traffic _analysis
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _traffic _analysis.
-- Return the traffic analysis settings for a network.
-version_added: '2.16.0'
+  - Get all networks _traffic _analysis.
+  - Return the traffic analysis settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_traffic_analysis_info
+notes:
+  - SDK Method used are networks.Networks.get_network_traffic_analysis,
+  - Paths used are get /networks/{networkId}/trafficAnalysis,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkTrafficAnalysis
-  description: Complete reference of the getNetworkTrafficAnalysis API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-analysis
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_traffic_analysis,
-
-  - Paths used are
-    get /networks/{networkId}/trafficAnalysis,
+  - description: Complete reference of the getNetworkTrafficAnalysis API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-analysis
+    name: Cisco Meraki documentation for networks getNetworkTrafficAnalysis
+short_description: Information module for networks _traffic _analysis
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _traffic _analysis
   cisco.meraki.networks_traffic_analysis_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_traffic_shaping_application_categories_info.py b/plugins/modules/networks_traffic_shaping_application_categories_info.py
index d1855bce3..30465e6c7 100644
--- a/plugins/modules/networks_traffic_shaping_application_categories_info.py
+++ b/plugins/modules/networks_traffic_shaping_application_categories_info.py
@@ -5,65 +5,63 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_traffic_shaping_application_categories_info
-short_description: Information module for networks _traffic _shaping _application _categories
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _traffic _shaping _application _categories.
-- Returns the application categories for traffic shaping rules. Only applicable on networks with a security applicance.
-version_added: '2.16.0'
+  - Get all networks _traffic _shaping _application _categories.
+  - Returns the application categories for traffic shaping rules. Only applicable
+    on networks with a security applicance.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_traffic_shaping_application_categories_info
+notes:
+  - SDK Method used are networks.Networks.get_network_traffic_shaping_application_categories,
+  - Paths used are get /networks/{networkId}/trafficShaping/applicationCategories,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkTrafficShapingApplicationCategories
-  description: Complete reference of the getNetworkTrafficShapingApplicationCategories API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-shaping-application-categories
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_traffic_shaping_application_categories,
-
-  - Paths used are
-    get /networks/{networkId}/trafficShaping/applicationCategories,
+  - description: Complete reference of the getNetworkTrafficShapingApplicationCategories
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-shaping-application-categories
+    name: Cisco Meraki documentation for networks getNetworkTrafficShapingApplicationCategories
+short_description: Information module for networks _traffic _shaping _application
+  _categories
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _traffic _shaping _application _categories
   cisco.meraki.networks_traffic_shaping_application_categories_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_traffic_shaping_dscp_tagging_options_info.py b/plugins/modules/networks_traffic_shaping_dscp_tagging_options_info.py
index 8ee5905c8..a3c8bced9 100644
--- a/plugins/modules/networks_traffic_shaping_dscp_tagging_options_info.py
+++ b/plugins/modules/networks_traffic_shaping_dscp_tagging_options_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_traffic_shaping_dscp_tagging_options_info
-short_description: Information module for networks _traffic _shaping _dscp _tagging _options
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _traffic _shaping _dscp _tagging _options.
-- Returns the available DSCP tagging options for your traffic shaping rules.
-version_added: '2.16.0'
+  - Get all networks _traffic _shaping _dscp _tagging _options.
+  - Returns the available DSCP tagging options for your traffic shaping rules.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_traffic_shaping_dscp_tagging_options_info
+notes:
+  - SDK Method used are networks.Networks.get_network_traffic_shaping_dscp_tagging_options,
+  - Paths used are get /networks/{networkId}/trafficShaping/dscpTaggingOptions,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkTrafficShapingDscpTaggingOptions
-  description: Complete reference of the getNetworkTrafficShapingDscpTaggingOptions API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-shaping-dscp-tagging-options
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_traffic_shaping_dscp_tagging_options,
-
-  - Paths used are
-    get /networks/{networkId}/trafficShaping/dscpTaggingOptions,
+  - description: Complete reference of the getNetworkTrafficShapingDscpTaggingOptions
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-traffic-shaping-dscp-tagging-options
+    name: Cisco Meraki documentation for networks getNetworkTrafficShapingDscpTaggingOptions
+short_description: Information module for networks _traffic _shaping _dscp _tagging
+  _options
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _traffic _shaping _dscp _tagging _options
   cisco.meraki.networks_traffic_shaping_dscp_tagging_options_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_unbind.py b/plugins/modules/networks_unbind.py
index 6ad50aaff..71c347cde 100644
--- a/plugins/modules/networks_unbind.py
+++ b/plugins/modules/networks_unbind.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_unbind
-short_description: Resource module for networks _unbind
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _unbind.
-- Unbind a network from a template.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _unbind.
+  - Unbind a network from a template.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_unbind
+notes:
+  - SDK Method used are networks.Networks.unbind_network,
+  - Paths used are post /networks/{networkId}/unbind,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +23,41 @@
     description: Optional boolean to retain all the current configs given by the template.
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks unbindNetwork
-  description: Complete reference of the unbindNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!unbind-network
-notes:
-  - SDK Method used are
-    networks.Networks.unbind_network,
-
-  - Paths used are
-    post /networks/{networkId}/unbind,
+  - description: Complete reference of the unbindNetwork API.
+    link: https://developer.cisco.com/meraki/api-v1/#!unbind-network
+    name: Cisco Meraki documentation for networks unbindNetwork
+short_description: Resource module for networks _unbind
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_unbind:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     retainConfigs: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_vlan_profiles.py b/plugins/modules/networks_vlan_profiles.py
index bfcfebb56..c4fd9503f 100644
--- a/plugins/modules/networks_vlan_profiles.py
+++ b/plugins/modules/networks_vlan_profiles.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_vlan_profiles
-short_description: Resource module for networks _vlan _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _vlan _profiles.
-- Create a VLAN profile for a network.
-- Delete a VLAN profile of a network.
-- Update an existing VLAN profile of a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _vlan _profiles.
+  - Create a VLAN profile for a network.
+  - Delete a VLAN profile of a network.
+  - Update an existing VLAN profile of a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_vlan_profiles
+notes:
+  - SDK Method used are networks.Networks.create_network_vlan_profile, networks.Networks.delete_network_vlan_profile,
+    networks.Networks.update_network_vlan_profile,
+  - Paths used are post /networks/{networkId}/vlanProfiles, delete /networks/{networkId}/vlanProfiles/{iname},
+    put /networks/{networkId}/vlanProfiles/{iname},
 options:
   iname:
     description: IName of the profile.
@@ -57,127 +59,116 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkVlanProfile
-  description: Complete reference of the createNetworkVlanProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-vlan-profile
-- name: Cisco Meraki documentation for networks deleteNetworkVlanProfile
-  description: Complete reference of the deleteNetworkVlanProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-vlan-profile
-- name: Cisco Meraki documentation for networks updateNetworkVlanProfile
-  description: Complete reference of the updateNetworkVlanProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-vlan-profile
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_vlan_profile,
-    networks.Networks.delete_network_vlan_profile,
-    networks.Networks.update_network_vlan_profile,
-
-  - Paths used are
-    post /networks/{networkId}/vlanProfiles,
-    delete /networks/{networkId}/vlanProfiles/{iname},
-    put /networks/{networkId}/vlanProfiles/{iname},
+  - description: Complete reference of the createNetworkVlanProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-vlan-profile
+    name: Cisco Meraki documentation for networks createNetworkVlanProfile
+  - description: Complete reference of the deleteNetworkVlanProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-vlan-profile
+    name: Cisco Meraki documentation for networks deleteNetworkVlanProfile
+  - description: Complete reference of the updateNetworkVlanProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-vlan-profile
+    name: Cisco Meraki documentation for networks updateNetworkVlanProfile
+short_description: Resource module for networks _vlan _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_vlan_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     iname: Profile1
     name: My VLAN profile name
     networkId: string
     vlanGroups:
-    - name: named-group-1
-      vlanIds: 2,5-7
+      - name: named-group-1
+        vlanIds: 2,5-7
     vlanNames:
-    - adaptivePolicyGroup:
-        id: '791'
-      name: named-1
-      vlanId: '1'
-
+      - adaptivePolicyGroup:
+          id: '791'
+        name: named-1
+        vlanId: '1'
 - name: Delete by name
   cisco.meraki.networks_vlan_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     iname: string
     networkId: string
-
 - name: Update by name
   cisco.meraki.networks_vlan_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     iname: string
     name: My VLAN profile name
     networkId: string
     vlanGroups:
-    - name: named-group-1
-      vlanIds: 2,5-7
+      - name: named-group-1
+        vlanIds: 2,5-7
     vlanNames:
-    - adaptivePolicyGroup:
-        id: '791'
-      name: named-1
-      vlanId: '1'
-
+      - adaptivePolicyGroup:
+          id: '791'
+        name: named-1
+        vlanId: '1'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_vlan_profiles_assignments_by_device_info.py b/plugins/modules/networks_vlan_profiles_assignments_by_device_info.py
index 6b8962bbb..fc514fcf8 100644
--- a/plugins/modules/networks_vlan_profiles_assignments_by_device_info.py
+++ b/plugins/modules/networks_vlan_profiles_assignments_by_device_info.py
@@ -5,98 +5,106 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_vlan_profiles_assignments_by_device_info
-short_description: Information module for networks _vlan _profiles _assignments _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _vlan _profiles _assignments _by _device.
-- Get the assigned VLAN Profiles for devices in a network.
-version_added: '2.16.0'
+  - Get all networks _vlan _profiles _assignments _by _device.
+  - Get the assigned VLAN Profiles for devices in a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_vlan_profiles_assignments_by_device_info
+notes:
+  - SDK Method used are networks.Networks.get_network_vlan_profiles_assignments_by_device,
+  - Paths used are get /networks/{networkId}/vlanProfiles/assignments/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  serials:
+  productTypes:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter devices by serials. All devices returned belong to
-      serial numbers that are an exact match.
+      - ProductTypes query parameter. Optional parameter to filter devices by product
+        types.
     elements: str
     type: list
-  productTypes:
+  serials:
     description:
-    - ProductTypes query parameter. Optional parameter to filter devices by product types.
+      - 'Serials query parameter. Optional parameter to filter devices by serials.
+        All devices returned belong to serial numbers that are an exact match.
+
+        '
     elements: str
     type: list
   stackIds:
     description:
-    - StackIds query parameter. Optional parameter to filter devices by Switch Stack ids.
+      - StackIds query parameter. Optional parameter to filter devices by Switch Stack
+        ids.
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkVlanProfilesAssignmentsByDevice
-  description: Complete reference of the getNetworkVlanProfilesAssignmentsByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profiles-assignments-by-device
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_vlan_profiles_assignments_by_device,
-
-  - Paths used are
-    get /networks/{networkId}/vlanProfiles/assignments/byDevice,
+  - description: Complete reference of the getNetworkVlanProfilesAssignmentsByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profiles-assignments-by-device
+    name: Cisco Meraki documentation for networks getNetworkVlanProfilesAssignmentsByDevice
+short_description: Information module for networks _vlan _profiles _assignments _by
+  _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _vlan _profiles _assignments _by _device
   cisco.meraki.networks_vlan_profiles_assignments_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -107,7 +115,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_vlan_profiles_assignments_reassign.py b/plugins/modules/networks_vlan_profiles_assignments_reassign.py
index e5b772e36..311aa25d3 100644
--- a/plugins/modules/networks_vlan_profiles_assignments_reassign.py
+++ b/plugins/modules/networks_vlan_profiles_assignments_reassign.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_vlan_profiles_assignments_reassign
-short_description: Resource module for networks _vlan _profiles _assignments _reassign
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _vlan _profiles _assignments _reassign.
-- Update the assigned VLAN Profile for devices in a network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _vlan _profiles _assignments
+    _reassign.
+  - Update the assigned VLAN Profile for devices in a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_vlan_profiles_assignments_reassign
+notes:
+  - SDK Method used are networks.Networks.reassign_network_vlan_profiles_assignments,
+  - Paths used are post /networks/{networkId}/vlanProfiles/assignments/reassign,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -35,51 +36,47 @@
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks reassignNetworkVlanProfilesAssignments
-  description: Complete reference of the reassignNetworkVlanProfilesAssignments API.
-  link: https://developer.cisco.com/meraki/api-v1/#!reassign-network-vlan-profiles-assignments
-notes:
-  - SDK Method used are
-    networks.Networks.reassign_network_vlan_profiles_assignments,
-
-  - Paths used are
-    post /networks/{networkId}/vlanProfiles/assignments/reassign,
+  - description: Complete reference of the reassignNetworkVlanProfilesAssignments
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!reassign-network-vlan-profiles-assignments
+    name: Cisco Meraki documentation for networks reassignNetworkVlanProfilesAssignments
+short_description: Resource module for networks _vlan _profiles _assignments _reassign
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_vlan_profiles_assignments_reassign:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     serials:
-    - Q234-ABCD-5678
+      - Q234-ABCD-5678
     stackIds:
-    - '1234'
+      - '1234'
     vlanProfile:
       iname: Profile1
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_vlan_profiles_info.py b/plugins/modules/networks_vlan_profiles_info.py
index 633c01da8..953d6e9f0 100644
--- a/plugins/modules/networks_vlan_profiles_info.py
+++ b/plugins/modules/networks_vlan_profiles_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_vlan_profiles_info
-short_description: Information module for networks _vlan _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _vlan _profiles.
-- Get networks _vlan _profiles by name.
-- Get an existing VLAN profile of a network.
-- List VLAN profiles for a network.
-version_added: '2.16.0'
+  - Get all networks _vlan _profiles.
+  - Get networks _vlan _profiles by name.
+  - Get an existing VLAN profile of a network.
+  - List VLAN profiles for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_vlan_profiles_info
+notes:
+  - SDK Method used are networks.Networks.get_network_vlan_profile, networks.Networks.get_network_vlan_profiles,
+  - Paths used are get /networks/{networkId}/vlanProfiles, get /networks/{networkId}/vlanProfiles/{iname},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  iname:
     description:
-    - NetworkId path parameter. Network ID.
+      - Iname path parameter.
     type: str
-  iname:
+  networkId:
     description:
-    - Iname path parameter.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkVlanProfile
-  description: Complete reference of the getNetworkVlanProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profile
-- name: Cisco Meraki documentation for networks getNetworkVlanProfiles
-  description: Complete reference of the getNetworkVlanProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profiles
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_vlan_profile,
-    networks.Networks.get_network_vlan_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/vlanProfiles,
-    get /networks/{networkId}/vlanProfiles/{iname},
+  - description: Complete reference of the getNetworkVlanProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profile
+    name: Cisco Meraki documentation for networks getNetworkVlanProfile
+  - description: Complete reference of the getNetworkVlanProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-vlan-profiles
+    name: Cisco Meraki documentation for networks getNetworkVlanProfiles
+short_description: Information module for networks _vlan _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _vlan _profiles
   cisco.meraki.networks_vlan_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _vlan _profiles by name
   cisco.meraki.networks_vlan_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     iname: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_webhooks_http_servers.py b/plugins/modules/networks_webhooks_http_servers.py
index 77fba675a..6d8ed3933 100644
--- a/plugins/modules/networks_webhooks_http_servers.py
+++ b/plugins/modules/networks_webhooks_http_servers.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_webhooks_http_servers
-short_description: Resource module for networks _webhooks _http _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _webhooks _http _servers.
-- Add an HTTP server to a network.
-- Delete an HTTP server from a network.
-- Update an HTTP server. To change a URL, create a new HTTP server.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _webhooks
+    _http _servers.
+  - Add an HTTP server to a network.
+  - Delete an HTTP server from a network.
+  - Update an HTTP server. To change a URL, create a new HTTP server.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_webhooks_http_servers
+notes:
+  - SDK Method used are networks.Networks.create_network_webhooks_http_server, networks.Networks.delete_network_webhooks_http_server,
+    networks.Networks.update_network_webhooks_http_server,
+  - Paths used are post /networks/{networkId}/webhooks/httpServers, delete /networks/{networkId}/webhooks/httpServers/{httpServerId},
+    put /networks/{networkId}/webhooks/httpServers/{httpServerId},
 options:
   httpServerId:
     description: HttpServerId path parameter. Http server ID.
@@ -35,10 +38,10 @@
         type: str
       payloadTemplateId:
         description: The ID of the payload template. Defaults to 'wpt_00001' for the
-          Meraki template. For Meraki-included templates for the Webex (included) template
-          use 'wpt_00002'; for the Slack (included) template use 'wpt_00003'; for the
-          Microsoft Teams (included) template use 'wpt_00004'; for the ServiceNow (included)
-          template use 'wpt_00006'.
+          Meraki template. For Meraki-included templates for the Webex (included)
+          template use 'wpt_00002'; for the Slack (included) template use 'wpt_00003';
+          for the Microsoft Teams (included) template use 'wpt_00004'; for the ServiceNow
+          (included) template use 'wpt_00006'.
         type: str
     type: dict
   sharedSecret:
@@ -49,53 +52,45 @@
     description: The URL of the HTTP server. Once set, cannot be updated.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkWebhooksHttpServer
-  description: Complete reference of the createNetworkWebhooksHttpServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-webhooks-http-server
-- name: Cisco Meraki documentation for networks deleteNetworkWebhooksHttpServer
-  description: Complete reference of the deleteNetworkWebhooksHttpServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-webhooks-http-server
-- name: Cisco Meraki documentation for networks updateNetworkWebhooksHttpServer
-  description: Complete reference of the updateNetworkWebhooksHttpServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-webhooks-http-server
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_webhooks_http_server,
-    networks.Networks.delete_network_webhooks_http_server,
-    networks.Networks.update_network_webhooks_http_server,
-
-  - Paths used are
-    post /networks/{networkId}/webhooks/httpServers,
-    delete /networks/{networkId}/webhooks/httpServers/{httpServerId},
-    put /networks/{networkId}/webhooks/httpServers/{httpServerId},
+  - description: Complete reference of the createNetworkWebhooksHttpServer API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-webhooks-http-server
+    name: Cisco Meraki documentation for networks createNetworkWebhooksHttpServer
+  - description: Complete reference of the deleteNetworkWebhooksHttpServer API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-webhooks-http-server
+    name: Cisco Meraki documentation for networks deleteNetworkWebhooksHttpServer
+  - description: Complete reference of the updateNetworkWebhooksHttpServer API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-webhooks-http-server
+    name: Cisco Meraki documentation for networks updateNetworkWebhooksHttpServer
+short_description: Resource module for networks _webhooks _http _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_webhooks_http_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Example Webhook Server
     networkId: string
@@ -104,55 +99,53 @@
       payloadTemplateId: wpt_00001
     sharedSecret: shhh
     url: https://example.com
-
 - name: Delete by id
   cisco.meraki.networks_webhooks_http_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     httpServerId: string
     networkId: string
-
 - name: Update by id
   cisco.meraki.networks_webhooks_http_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     httpServerId: string
     name: Example Webhook Server
@@ -160,7 +153,6 @@
     payloadTemplate:
       payloadTemplateId: wpt_00001
     sharedSecret: shhh
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_webhooks_http_servers_info.py b/plugins/modules/networks_webhooks_http_servers_info.py
index 6ea4fa8db..9e9684afa 100644
--- a/plugins/modules/networks_webhooks_http_servers_info.py
+++ b/plugins/modules/networks_webhooks_http_servers_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_webhooks_http_servers_info
-short_description: Information module for networks _webhooks _http _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _webhooks _http _servers.
-- Get networks _webhooks _http _servers by id.
-- List the HTTP servers for a network.
-- Return an HTTP server for a network.
-version_added: '2.16.0'
+  - Get all networks _webhooks _http _servers.
+  - Get networks _webhooks _http _servers by id.
+  - List the HTTP servers for a network.
+  - Return an HTTP server for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_webhooks_http_servers_info
+notes:
+  - SDK Method used are networks.Networks.get_network_webhooks_http_server, networks.Networks.get_network_webhooks_http_servers,
+  - Paths used are get /networks/{networkId}/webhooks/httpServers, get /networks/{networkId}/webhooks/httpServers/{httpServerId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  httpServerId:
     description:
-    - NetworkId path parameter. Network ID.
+      - HttpServerId path parameter. Http server ID.
     type: str
-  httpServerId:
+  networkId:
     description:
-    - HttpServerId path parameter. Http server ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkWebhooksHttpServer
-  description: Complete reference of the getNetworkWebhooksHttpServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-http-server
-- name: Cisco Meraki documentation for networks getNetworkWebhooksHttpServers
-  description: Complete reference of the getNetworkWebhooksHttpServers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-http-servers
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_webhooks_http_server,
-    networks.Networks.get_network_webhooks_http_servers,
-
-  - Paths used are
-    get /networks/{networkId}/webhooks/httpServers,
-    get /networks/{networkId}/webhooks/httpServers/{httpServerId},
+  - description: Complete reference of the getNetworkWebhooksHttpServer API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-http-server
+    name: Cisco Meraki documentation for networks getNetworkWebhooksHttpServer
+  - description: Complete reference of the getNetworkWebhooksHttpServers API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-http-servers
+    name: Cisco Meraki documentation for networks getNetworkWebhooksHttpServers
+short_description: Information module for networks _webhooks _http _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _webhooks _http _servers
   cisco.meraki.networks_webhooks_http_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _webhooks _http _servers by id
   cisco.meraki.networks_webhooks_http_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     httpServerId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_webhooks_payload_templates.py b/plugins/modules/networks_webhooks_payload_templates.py
index 4c44e1373..f465ac218 100644
--- a/plugins/modules/networks_webhooks_payload_templates.py
+++ b/plugins/modules/networks_webhooks_payload_templates.py
@@ -5,20 +5,25 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_webhooks_payload_templates
-short_description: Resource module for networks _webhooks _payload _templates
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _webhooks _payload _templates.
-- Create a webhook payload template for a network.
-- >
-   Destroy a webhook payload template for a network. Does not work for included templates 'wpt_00001', 'wpt_00002',
-   'wpt_00003', 'wpt_00004', 'wpt_00005' or 'wpt_00006' .
-- Update a webhook payload template for a network.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _webhooks
+    _payload _templates.
+  - Create a webhook payload template for a network.
+  - 'Destroy a webhook payload template for a network. Does not work for included
+    templates ''wpt_00001'', ''wpt_00002'', ''wpt_00003'', ''wpt_00004'', ''wpt_00005''
+    or ''wpt_00006'' .
+
+    '
+  - Update a webhook payload template for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_webhooks_payload_templates
+notes:
+  - SDK Method used are networks.Networks.create_network_webhooks_payload_template,
+    networks.Networks.delete_network_webhooks_payload_template, networks.Networks.update_network_webhooks_payload_template,
+  - Paths used are post /networks/{networkId}/webhooks/payloadTemplates, delete /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
+    put /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
 options:
   body:
     description: The liquid template used for the body of the webhook message. Either
@@ -53,122 +58,113 @@
     description: PayloadTemplateId path parameter. Payload template ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks createNetworkWebhooksPayloadTemplate
-  description: Complete reference of the createNetworkWebhooksPayloadTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-webhooks-payload-template
-- name: Cisco Meraki documentation for networks deleteNetworkWebhooksPayloadTemplate
-  description: Complete reference of the deleteNetworkWebhooksPayloadTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-webhooks-payload-template
-- name: Cisco Meraki documentation for networks updateNetworkWebhooksPayloadTemplate
-  description: Complete reference of the updateNetworkWebhooksPayloadTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-webhooks-payload-template
-notes:
-  - SDK Method used are
-    networks.Networks.create_network_webhooks_payload_template,
-    networks.Networks.delete_network_webhooks_payload_template,
-    networks.Networks.update_network_webhooks_payload_template,
-
-  - Paths used are
-    post /networks/{networkId}/webhooks/payloadTemplates,
-    delete /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
-    put /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
+  - description: Complete reference of the createNetworkWebhooksPayloadTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-webhooks-payload-template
+    name: Cisco Meraki documentation for networks createNetworkWebhooksPayloadTemplate
+  - description: Complete reference of the deleteNetworkWebhooksPayloadTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-webhooks-payload-template
+    name: Cisco Meraki documentation for networks deleteNetworkWebhooksPayloadTemplate
+  - description: Complete reference of the updateNetworkWebhooksPayloadTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-webhooks-payload-template
+    name: Cisco Meraki documentation for networks updateNetworkWebhooksPayloadTemplate
+short_description: Resource module for networks _webhooks _payload _templates
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_webhooks_payload_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
-    body: '{"event_type":"{{alertTypeId}}","client_payload":{"text":"{{alertData}}"}}'
+    body: '{"event_type":"{{ alertTypeId }}","client_payload":{"text":"{{ alertData
+      }}"}}'
     bodyFile: Qm9keSBGaWxl
     headers:
-    - name: Authorization
-      template: Bearer {{sharedSecret}}
+      - name: Authorization
+        template: Bearer {{ sharedSecret }}
     headersFile: SGVhZGVycyBGaWxl
     name: Custom Template
     networkId: string
-
 - name: Delete by id
   cisco.meraki.networks_webhooks_payload_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     payloadTemplateId: string
-
 - name: Update by id
   cisco.meraki.networks_webhooks_payload_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
-    body: '{"event_type":"{{alertTypeId}}","client_payload":{"text":"{{alertData}}"}}'
+    body: '{"event_type":"{{ alertTypeId }}","client_payload":{"text":"{{ alertData
+      }}"}}'
     bodyFile: Qm9keSBGaWxl
     headers:
-    - name: Authorization
-      template: Bearer {{sharedSecret}}
+      - name: Authorization
+        template: Bearer {{ sharedSecret }}
     headersFile: SGVhZGVycyBGaWxl
     name: Custom Template
     networkId: string
     payloadTemplateId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_webhooks_payload_templates_info.py b/plugins/modules/networks_webhooks_payload_templates_info.py
index db743bb30..7986f931f 100644
--- a/plugins/modules/networks_webhooks_payload_templates_info.py
+++ b/plugins/modules/networks_webhooks_payload_templates_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_webhooks_payload_templates_info
-short_description: Information module for networks _webhooks _payload _templates
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _webhooks _payload _templates.
-- Get networks _webhooks _payload _templates by id.
-- Get the webhook payload template for a network.
-- List the webhook payload templates for a network.
-version_added: '2.16.0'
+  - Get all networks _webhooks _payload _templates.
+  - Get networks _webhooks _payload _templates by id.
+  - Get the webhook payload template for a network.
+  - List the webhook payload templates for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_webhooks_payload_templates_info
+notes:
+  - SDK Method used are networks.Networks.get_network_webhooks_payload_template, networks.Networks.get_network_webhooks_payload_templates,
+  - Paths used are get /networks/{networkId}/webhooks/payloadTemplates, get /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   payloadTemplateId:
     description:
-    - PayloadTemplateId path parameter. Payload template ID.
+      - PayloadTemplateId path parameter. Payload template ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkWebhooksPayloadTemplate
-  description: Complete reference of the getNetworkWebhooksPayloadTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-payload-template
-- name: Cisco Meraki documentation for networks getNetworkWebhooksPayloadTemplates
-  description: Complete reference of the getNetworkWebhooksPayloadTemplates API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-payload-templates
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_webhooks_payload_template,
-    networks.Networks.get_network_webhooks_payload_templates,
-
-  - Paths used are
-    get /networks/{networkId}/webhooks/payloadTemplates,
-    get /networks/{networkId}/webhooks/payloadTemplates/{payloadTemplateId},
+  - description: Complete reference of the getNetworkWebhooksPayloadTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-payload-template
+    name: Cisco Meraki documentation for networks getNetworkWebhooksPayloadTemplate
+  - description: Complete reference of the getNetworkWebhooksPayloadTemplates API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-payload-templates
+    name: Cisco Meraki documentation for networks getNetworkWebhooksPayloadTemplates
+short_description: Information module for networks _webhooks _payload _templates
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _webhooks _payload _templates
   cisco.meraki.networks_webhooks_payload_templates_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _webhooks _payload _templates by id
   cisco.meraki.networks_webhooks_payload_templates_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     payloadTemplateId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_webhooks_webhook_tests_info.py b/plugins/modules/networks_webhooks_webhook_tests_info.py
index 1a31956d4..f924c2ced 100644
--- a/plugins/modules/networks_webhooks_webhook_tests_info.py
+++ b/plugins/modules/networks_webhooks_webhook_tests_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_webhooks_webhook_tests_info
-short_description: Information module for networks _webhooks _webhook _tests
+author: Francisco Munoz (@fmunoz)
 description:
-- Get networks _webhooks _webhook _tests by id.
-- Return the status of a webhook test for a network.
-version_added: '2.16.0'
+  - Get networks _webhooks _webhook _tests by id.
+  - Return the status of a webhook test for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_webhooks_webhook_tests_info
+notes:
+  - SDK Method used are networks.Networks.get_network_webhooks_webhook_test,
+  - Paths used are get /networks/{networkId}/webhooks/webhookTests/{webhookTestId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   webhookTestId:
     description:
-    - WebhookTestId path parameter. Webhook test ID.
+      - WebhookTestId path parameter. Webhook test ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for networks getNetworkWebhooksWebhookTest
-  description: Complete reference of the getNetworkWebhooksWebhookTest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-webhook-test
-notes:
-  - SDK Method used are
-    networks.Networks.get_network_webhooks_webhook_test,
-
-  - Paths used are
-    get /networks/{networkId}/webhooks/webhookTests/{webhookTestId},
+  - description: Complete reference of the getNetworkWebhooksWebhookTest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-webhooks-webhook-test
+    name: Cisco Meraki documentation for networks getNetworkWebhooksWebhookTest
+short_description: Information module for networks _webhooks _webhook _tests
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get networks _webhooks _webhook _tests by id
   cisco.meraki.networks_webhooks_webhook_tests_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     webhookTestId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_air_marshal_rules.py b/plugins/modules/networks_wireless_air_marshal_rules.py
index d087ae95c..b26da7520 100644
--- a/plugins/modules/networks_wireless_air_marshal_rules.py
+++ b/plugins/modules/networks_wireless_air_marshal_rules.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_air_marshal_rules
-short_description: Resource module for networks _wireless _air _marshal _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _wireless _air _marshal _rules.
-- Creates a new rule.
-version_added: '2.20.0'
+  - Manage operation create of the resource networks _wireless _air _marshal _rules.
+  - Creates a new rule.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_air_marshal_rules
+notes:
+  - SDK Method used are wireless.Wireless.create_network_wireless_air_marshal_rule,
+  - Paths used are post /networks/{networkId}/wireless/airMarshal/rules,
 options:
   match:
     description: Object describing the rule specification.
@@ -33,49 +33,44 @@
     description: Indicates if this rule will allow, block, or alert.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless createNetworkWirelessAirMarshalRule
-  description: Complete reference of the createNetworkWirelessAirMarshalRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-air-marshal-rule
-notes:
-  - SDK Method used are
-    wireless.Wireless.create_network_wireless_air_marshal_rule,
-
-  - Paths used are
-    post /networks/{networkId}/wireless/airMarshal/rules,
+  - description: Complete reference of the createNetworkWirelessAirMarshalRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-air-marshal-rule
+    name: Cisco Meraki documentation for wireless createNetworkWirelessAirMarshalRule
+short_description: Resource module for networks _wireless _air _marshal _rules
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_wireless_air_marshal_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     match:
       string: 00:11:22:33:44:55
       type: bssid
     networkId: string
     type: allow
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_air_marshal_rules_delete.py b/plugins/modules/networks_wireless_air_marshal_rules_delete.py
index c7b81fef4..f3eb2dab2 100644
--- a/plugins/modules/networks_wireless_air_marshal_rules_delete.py
+++ b/plugins/modules/networks_wireless_air_marshal_rules_delete.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_air_marshal_rules_delete
-short_description: Resource module for networks _wireless _air _marshal _rules _delete
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation delete of the resource networks _wireless _air _marshal _rules _delete.
-- Delete an Air Marshal rule.
-version_added: '2.20.0'
+  - Manage operation delete of the resource networks _wireless _air _marshal _rules
+    _delete.
+  - Delete an Air Marshal rule.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_air_marshal_rules_delete
+notes:
+  - SDK Method used are wireless.Wireless.delete_network_wireless_air_marshal_rule,
+  - Paths used are delete /networks/{networkId}/wireless/airMarshal/rules/{ruleId},
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +24,41 @@
     description: RuleId path parameter. Rule ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless deleteNetworkWirelessAirMarshalRule
-  description: Complete reference of the deleteNetworkWirelessAirMarshalRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-air-marshal-rule
-notes:
-  - SDK Method used are
-    wireless.Wireless.delete_network_wireless_air_marshal_rule,
-
-  - Paths used are
-    delete /networks/{networkId}/wireless/airMarshal/rules/{ruleId},
+  - description: Complete reference of the deleteNetworkWirelessAirMarshalRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-air-marshal-rule
+    name: Cisco Meraki documentation for wireless deleteNetworkWirelessAirMarshalRule
+short_description: Resource module for networks _wireless _air _marshal _rules _delete
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Delete by id
   cisco.meraki.networks_wireless_air_marshal_rules_delete:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     ruleId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_air_marshal_rules_update.py b/plugins/modules/networks_wireless_air_marshal_rules_update.py
index c0d53e24c..08cfcf250 100644
--- a/plugins/modules/networks_wireless_air_marshal_rules_update.py
+++ b/plugins/modules/networks_wireless_air_marshal_rules_update.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_air_marshal_rules_update
-short_description: Resource module for networks _wireless _air _marshal _rules _update
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _air _marshal _rules _update.
-- Update a rule.
-version_added: '2.20.0'
+  - Manage operation update of the resource networks _wireless _air _marshal _rules
+    _update.
+  - Update a rule.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_air_marshal_rules_update
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_air_marshal_rule,
+  - Paths used are put /networks/{networkId}/wireless/airMarshal/rules/{ruleId},
 options:
   match:
     description: Object describing the rule specification.
@@ -36,50 +37,45 @@
     description: Indicates if this rule will allow, block, or alert.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessAirMarshalRule
-  description: Complete reference of the updateNetworkWirelessAirMarshalRule API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-air-marshal-rule
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_air_marshal_rule,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/airMarshal/rules/{ruleId},
+  - description: Complete reference of the updateNetworkWirelessAirMarshalRule API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-air-marshal-rule
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessAirMarshalRule
+short_description: Resource module for networks _wireless _air _marshal _rules _update
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_wireless_air_marshal_rules_update:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     match:
       string: 00:11:22:33:44:55
       type: bssid
     networkId: string
     ruleId: string
     type: allow
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_air_marshal_settings.py b/plugins/modules/networks_wireless_air_marshal_settings.py
index d2e8ca492..f9e297ef7 100644
--- a/plugins/modules/networks_wireless_air_marshal_settings.py
+++ b/plugins/modules/networks_wireless_air_marshal_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_air_marshal_settings
-short_description: Resource module for networks _wireless _air _marshal _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _air _marshal _settings.
-- Updates Air Marshal settings.
-version_added: '2.20.0'
+  - Manage operation update of the resource networks _wireless _air _marshal _settings.
+  - Updates Air Marshal settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_air_marshal_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_air_marshal_settings,
+  - Paths used are put /networks/{networkId}/wireless/airMarshal/settings,
 options:
   defaultPolicy:
     description: Allows clients to access rogue networks. Blocked by default.
@@ -23,46 +23,42 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessAirMarshalSettings
-  description: Complete reference of the updateNetworkWirelessAirMarshalSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-air-marshal-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_air_marshal_settings,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/airMarshal/settings,
+  - description: Complete reference of the updateNetworkWirelessAirMarshalSettings
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-air-marshal-settings
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessAirMarshalSettings
+short_description: Resource module for networks _wireless _air _marshal _settings
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_air_marshal_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     defaultPolicy: allow
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_alternate_management_interface.py b/plugins/modules/networks_wireless_alternate_management_interface.py
index d0c18ee4e..dd749b534 100644
--- a/plugins/modules/networks_wireless_alternate_management_interface.py
+++ b/plugins/modules/networks_wireless_alternate_management_interface.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_alternate_management_interface
-short_description: Resource module for networks _wireless _alternate _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _alternate _management _interface.
-- Update alternate management interface and device static IP.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _alternate _management
+    _interface.
+  - Update alternate management interface and device static IP.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_alternate_management_interface
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_alternate_management_interface,
+  - Paths used are put /networks/{networkId}/wireless/alternateManagementInterface,
 options:
   accessPoints:
     description: Array of access point serial number and IP assignment. Note accessPoints
@@ -24,8 +25,8 @@
     elements: dict
     suboptions:
       alternateManagementIp:
-        description: Wireless alternate management interface device IP. Provide an empty
-          string to remove alternate management IP assignment.
+        description: Wireless alternate management interface device IP. Provide an
+          empty string to remove alternate management IP assignment.
         type: str
       dns1:
         description: Primary DNS must be in IP format.
@@ -37,8 +38,8 @@
         description: Gateway must be in IP format.
         type: str
       serial:
-        description: Serial number of access point to be configured with alternate management
-          IP.
+        description: Serial number of access point to be configured with alternate
+          management IP.
         type: str
       subnetMask:
         description: Subnet mask must be in IP format.
@@ -59,60 +60,56 @@
     description: Alternate management interface VLAN, must be between 1 and 4094.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessAlternateManagementInterface
-  description: Complete reference of the updateNetworkWirelessAlternateManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-alternate-management-interface
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_alternate_management_interface,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/alternateManagementInterface,
+  - description: Complete reference of the updateNetworkWirelessAlternateManagementInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-alternate-management-interface
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessAlternateManagementInterface
+short_description: Resource module for networks _wireless _alternate _management _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_alternate_management_interface:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPoints:
-    - alternateManagementIp: 1.2.3.4
-      dns1: 8.8.8.8
-      dns2: 8.8.4.4
-      gateway: 1.2.3.5
-      serial: Q234-ABCD-5678
-      subnetMask: 255.255.255.0
+      - alternateManagementIp: 1.2.3.4
+        dns1: 8.8.8.8
+        dns2: 8.8.4.4
+        gateway: 1.2.3.5
+        serial: Q234-ABCD-5678
+        subnetMask: 255.255.255.0
     enabled: true
     networkId: string
     protocols:
-    - radius
-    - snmp
-    - syslog
-    - ldap
+      - radius
+      - snmp
+      - syslog
+      - ldap
     vlanId: 100
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_alternate_management_interface_info.py b/plugins/modules/networks_wireless_alternate_management_interface_info.py
index 79edbadbd..244d44313 100644
--- a/plugins/modules/networks_wireless_alternate_management_interface_info.py
+++ b/plugins/modules/networks_wireless_alternate_management_interface_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_alternate_management_interface_info
-short_description: Information module for networks _wireless _alternate _management _interface
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _alternate _management _interface.
-- Return alternate management interface and devices with IP assigned.
-version_added: '2.16.0'
+  - Get all networks _wireless _alternate _management _interface.
+  - Return alternate management interface and devices with IP assigned.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_alternate_management_interface_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_alternate_management_interface,
+  - Paths used are get /networks/{networkId}/wireless/alternateManagementInterface,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessAlternateManagementInterface
-  description: Complete reference of the getNetworkWirelessAlternateManagementInterface API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-alternate-management-interface
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_alternate_management_interface,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/alternateManagementInterface,
+  - description: Complete reference of the getNetworkWirelessAlternateManagementInterface
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-alternate-management-interface
+    name: Cisco Meraki documentation for wireless getNetworkWirelessAlternateManagementInterface
+short_description: Information module for networks _wireless _alternate _management
+  _interface
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _alternate _management _interface
   cisco.meraki.networks_wireless_alternate_management_interface_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_billing.py b/plugins/modules/networks_wireless_billing.py
index 2e6db99f7..20f54f51a 100644
--- a/plugins/modules/networks_wireless_billing.py
+++ b/plugins/modules/networks_wireless_billing.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_billing
-short_description: Resource module for networks _wireless _billing
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _billing.
-- Update the billing settings.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _billing.
+  - Update the billing settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_billing
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_billing,
+  - Paths used are put /networks/{networkId}/wireless/billing,
 options:
   currency:
     description: The currency code of this node group's billing plans.
@@ -51,54 +51,49 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessBilling
-  description: Complete reference of the updateNetworkWirelessBilling API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-billing
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_billing,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/billing,
+  - description: Complete reference of the updateNetworkWirelessBilling API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-billing
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessBilling
+short_description: Resource module for networks _wireless _billing
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_billing:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     currency: USD
     networkId: string
     plans:
-    - bandwidthLimits:
-        limitDown: 1000000
-        limitUp: 1000000
-      id: '1'
-      price: 5.0
-      timeLimit: 1 hour
-
+      - bandwidthLimits:
+          limitDown: 1000000
+          limitUp: 1000000
+        id: '1'
+        price: 5.0
+        timeLimit: 1 hour
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_billing_info.py b/plugins/modules/networks_wireless_billing_info.py
index 0cb11b1e4..cb6fa9eeb 100644
--- a/plugins/modules/networks_wireless_billing_info.py
+++ b/plugins/modules/networks_wireless_billing_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_billing_info
-short_description: Information module for networks _wireless _billing
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _billing.
-- Return the billing settings of this network.
-version_added: '2.16.0'
+  - Get all networks _wireless _billing.
+  - Return the billing settings of this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_billing_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_billing,
+  - Paths used are get /networks/{networkId}/wireless/billing,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessBilling
-  description: Complete reference of the getNetworkWirelessBilling API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-billing
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_billing,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/billing,
+  - description: Complete reference of the getNetworkWirelessBilling API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-billing
+    name: Cisco Meraki documentation for wireless getNetworkWirelessBilling
+short_description: Information module for networks _wireless _billing
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _billing
   cisco.meraki.networks_wireless_billing_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_bluetooth_settings.py b/plugins/modules/networks_wireless_bluetooth_settings.py
index 6c28d9d68..e65c0fe01 100644
--- a/plugins/modules/networks_wireless_bluetooth_settings.py
+++ b/plugins/modules/networks_wireless_bluetooth_settings.py
@@ -5,31 +5,31 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_bluetooth_settings
-short_description: Resource module for networks _wireless _bluetooth _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _bluetooth _settings.
-- Update the Bluetooth settings for a network. See the docs page for Bluetooth.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _bluetooth _settings.
+  - Update the Bluetooth settings for a network. See the docs page for Bluetooth.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_bluetooth_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_bluetooth_settings,
+  - Paths used are put /networks/{networkId}/wireless/bluetooth/settings,
 options:
   advertisingEnabled:
     description: Whether APs will advertise beacons.
     type: bool
   major:
-    description: The major number to be used in the beacon identifier. Only valid in
-      'Non-unique' mode.
+    description: The major number to be used in the beacon identifier. Only valid
+      in 'Non-unique' mode.
     type: int
   majorMinorAssignmentMode:
-    description: The way major and minor number should be assigned to nodes in the network.
-      ('Unique', 'Non-unique').
+    description: The way major and minor number should be assigned to nodes in the
+      network. ('Unique', 'Non-unique').
     type: str
   minor:
-    description: The minor number to be used in the beacon identifier. Only valid in
-      'Non-unique' mode.
+    description: The minor number to be used in the beacon identifier. Only valid
+      in 'Non-unique' mode.
     type: int
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -41,43 +41,40 @@
     description: The UUID to be used in the beacon identifier.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessBluetoothSettings
-  description: Complete reference of the updateNetworkWirelessBluetoothSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-bluetooth-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_bluetooth_settings,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/bluetooth/settings,
+  - description: Complete reference of the updateNetworkWirelessBluetoothSettings
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-bluetooth-settings
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessBluetoothSettings
+short_description: Resource module for networks _wireless _bluetooth _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_bluetooth_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     advertisingEnabled: true
     major: 1
@@ -86,7 +83,6 @@
     networkId: string
     scanningEnabled: true
     uuid: 00000000-0000-0000-000-000000000000
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_bluetooth_settings_info.py b/plugins/modules/networks_wireless_bluetooth_settings_info.py
index 3a801e0b8..251205c16 100644
--- a/plugins/modules/networks_wireless_bluetooth_settings_info.py
+++ b/plugins/modules/networks_wireless_bluetooth_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_bluetooth_settings_info
-short_description: Information module for networks _wireless _bluetooth _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _bluetooth _settings.
-- Return the Bluetooth settings for a network. Bluetooth.
-version_added: '2.16.0'
+  - Get all networks _wireless _bluetooth _settings.
+  - Return the Bluetooth settings for a network. Bluetooth.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_bluetooth_settings_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_bluetooth_settings,
+  - Paths used are get /networks/{networkId}/wireless/bluetooth/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessBluetoothSettings
-  description: Complete reference of the getNetworkWirelessBluetoothSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-bluetooth-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_bluetooth_settings,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/bluetooth/settings,
+  - description: Complete reference of the getNetworkWirelessBluetoothSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-bluetooth-settings
+    name: Cisco Meraki documentation for wireless getNetworkWirelessBluetoothSettings
+short_description: Information module for networks _wireless _bluetooth _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _bluetooth _settings
   cisco.meraki.networks_wireless_bluetooth_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_channel_utilization_history_info.py b/plugins/modules/networks_wireless_channel_utilization_history_info.py
index 92f664b57..6057f5600 100644
--- a/plugins/modules/networks_wireless_channel_utilization_history_info.py
+++ b/plugins/modules/networks_wireless_channel_utilization_history_info.py
@@ -5,123 +5,133 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_channel_utilization_history_info
-short_description: Information module for networks _wireless _channel _utilization _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _channel _utilization _history.
-- Return AP channel utilization over time for a device or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _channel _utilization _history.
+  - Return AP channel utilization over time for a device or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_channel_utilization_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_channel_utilization_history,
+  - Paths used are get /networks/{networkId}/wireless/channelUtilizationHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - 'ApTag query parameter. Filter results by AP tag to return AP channel utilization
+        metrics for devices labeled with the given tag; either clientId or deviceSerial
+        must be jointly specified.
+
+        '
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 600,
-      1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - >
-      ClientId query parameter. Filter results by network client to return per-device, per-band AP channel
-      utilization metrics inner joined by the queried client's connection history.
+      - 'ClientId query parameter. Filter results by network client to return per-device,
+        per-band AP channel utilization metrics inner joined by the queried client''s
+        connection history.
+
+        '
     type: str
   deviceSerial:
     description:
-    - >
-      DeviceSerial query parameter. Filter results by device to return AP channel utilization metrics for the
-      queried device; either band or clientId must be jointly specified.
+      - 'DeviceSerial query parameter. Filter results by device to return AP channel
+        utilization metrics for the queried device; either band or clientId must be
+        jointly specified.
+
+        '
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - >
-      ApTag query parameter. Filter results by AP tag to return AP channel utilization metrics for devices labeled
-      with the given tag; either clientId or deviceSerial must be jointly specified.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 600, 1200, 3600, 14400, 86400. The default is 86400.
+
+        '
+    type: int
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
+    description:
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessChannelUtilizationHistory
-  description: Complete reference of the getNetworkWirelessChannelUtilizationHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-channel-utilization-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_channel_utilization_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/channelUtilizationHistory,
+  - description: Complete reference of the getNetworkWirelessChannelUtilizationHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-channel-utilization-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessChannelUtilizationHistory
+short_description: Information module for networks _wireless _channel _utilization
+  _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _channel _utilization _history
   cisco.meraki.networks_wireless_channel_utilization_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
     band: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_client_count_history_info.py b/plugins/modules/networks_wireless_client_count_history_info.py
index f0140270e..c1612a901 100644
--- a/plugins/modules/networks_wireless_client_count_history_info.py
+++ b/plugins/modules/networks_wireless_client_count_history_info.py
@@ -5,116 +5,121 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_client_count_history_info
-short_description: Information module for networks _wireless _client _count _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _client _count _history.
-- Return wireless client counts over time for a network, device, or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _client _count _history.
+  - Return wireless client counts over time for a network, device, or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_client_count_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_client_count_history,
+  - Paths used are get /networks/{networkId}/wireless/clientCountHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - ApTag query parameter. Filter results by AP tag.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - >
-      ClientId query parameter. Filter results by network client to return per-device client counts over time
-      inner joined by the queried client's connection history.
+      - 'ClientId query parameter. Filter results by network client to return per-device
+        client counts over time inner joined by the queried client''s connection history.
+
+        '
     type: str
   deviceSerial:
     description:
-    - DeviceSerial query parameter. Filter results by device.
+      - DeviceSerial query parameter. Filter results by device.
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - ApTag query parameter. Filter results by AP tag.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   ssid:
     description:
-    - Ssid query parameter. Filter results by SSID number.
+      - Ssid query parameter. Filter results by SSID number.
     type: int
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
+    description:
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessClientCountHistory
-  description: Complete reference of the getNetworkWirelessClientCountHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-count-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_client_count_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/clientCountHistory,
+  - description: Complete reference of the getNetworkWirelessClientCountHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-count-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessClientCountHistory
+short_description: Information module for networks _wireless _client _count _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _client _count _history
   cisco.meraki.networks_wireless_client_count_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
@@ -122,7 +127,6 @@
     ssid: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_clients_connection_stats_info.py b/plugins/modules/networks_wireless_clients_connection_stats_info.py
index 05239585a..10a167d92 100644
--- a/plugins/modules/networks_wireless_clients_connection_stats_info.py
+++ b/plugins/modules/networks_wireless_clients_connection_stats_info.py
@@ -5,98 +5,102 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_clients_connection_stats_info
-short_description: Information module for networks _wireless _clients _connection _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _clients _connection _stats.
-- Aggregated connectivity info for a given client on this network. Clients are identified by their MAC.
-version_added: '2.16.0'
+  - Get all networks _wireless _clients _connection _stats.
+  - Aggregated connectivity info for a given client on this network. Clients are identified
+    by their MAC.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_clients_connection_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_client_connection_stats,
+  - Paths used are get /networks/{networkId}/wireless/clients/{clientId}/connectionStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
+  clientId:
+    description:
+      - ClientId path parameter. Client ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  clientId:
+  ssid:
     description:
-    - ClientId path parameter. Client ID.
-    type: str
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessClientConnectionStats
-  description: Complete reference of the getNetworkWirelessClientConnectionStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-connection-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_client_connection_stats,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/clients/{clientId}/connectionStats,
+  - description: Complete reference of the getNetworkWirelessClientConnectionStats
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-connection-stats
+    name: Cisco Meraki documentation for wireless getNetworkWirelessClientConnectionStats
+short_description: Information module for networks _wireless _clients _connection
+  _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _clients _connection _stats
   cisco.meraki.networks_wireless_clients_connection_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -107,7 +111,6 @@
     networkId: string
     clientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_clients_latency_stats_info.py b/plugins/modules/networks_wireless_clients_latency_stats_info.py
index 8e4e84690..88f3d3f46 100644
--- a/plugins/modules/networks_wireless_clients_latency_stats_info.py
+++ b/plugins/modules/networks_wireless_clients_latency_stats_info.py
@@ -5,105 +5,108 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_clients_latency_stats_info
-short_description: Information module for networks _wireless _clients _latency _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _clients _latency _stats.
-- Aggregated latency info for a given client on this network. Clients are identified by their MAC.
-version_added: '2.16.0'
+  - Get all networks _wireless _clients _latency _stats.
+  - Aggregated latency info for a given client on this network. Clients are identified
+    by their MAC.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_clients_latency_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_client_latency_stats,
+  - Paths used are get /networks/{networkId}/wireless/clients/{clientId}/latencyStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
+  clientId:
+    description:
+      - ClientId path parameter. Client ID.
+    type: str
+  fields:
+    description:
+      - 'Fields query parameter. Partial selection If present, this call will return
+        only the selected fields of "rawDistribution", "avg". All fields will be returned
+        by default. Selected fields must be entered as a comma separated string.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
-  clientId:
+  ssid:
     description:
-    - ClientId path parameter. Client ID.
-    type: str
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
-  fields:
-    description:
-    - >
-      Fields query parameter. Partial selection If present, this call will return only the selected fields of
-      "rawDistribution", "avg". All fields will be returned by default. Selected fields must be entered as a comma
-      separated string.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessClientLatencyStats
-  description: Complete reference of the getNetworkWirelessClientLatencyStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-latency-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_client_latency_stats,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/clients/{clientId}/latencyStats,
+  - description: Complete reference of the getNetworkWirelessClientLatencyStats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-client-latency-stats
+    name: Cisco Meraki documentation for wireless getNetworkWirelessClientLatencyStats
+short_description: Information module for networks _wireless _clients _latency _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _clients _latency _stats
   cisco.meraki.networks_wireless_clients_latency_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -115,7 +118,6 @@
     networkId: string
     clientId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_connection_stats_info.py b/plugins/modules/networks_wireless_connection_stats_info.py
index 02dba794d..10beea1e7 100644
--- a/plugins/modules/networks_wireless_connection_stats_info.py
+++ b/plugins/modules/networks_wireless_connection_stats_info.py
@@ -5,94 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_connection_stats_info
-short_description: Information module for networks _wireless _connection _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _connection _stats.
-- Aggregated connectivity info for this network.
-version_added: '2.16.0'
+  - Get all networks _wireless _connection _stats.
+  - Aggregated connectivity info for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_connection_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_connection_stats,
+  - Paths used are get /networks/{networkId}/wireless/connectionStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessConnectionStats
-  description: Complete reference of the getNetworkWirelessConnectionStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-connection-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_connection_stats,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/connectionStats,
+  - description: Complete reference of the getNetworkWirelessConnectionStats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-connection-stats
+    name: Cisco Meraki documentation for wireless getNetworkWirelessConnectionStats
+short_description: Information module for networks _wireless _connection _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _connection _stats
   cisco.meraki.networks_wireless_connection_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -102,7 +103,6 @@
     apTag: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_data_rate_history_info.py b/plugins/modules/networks_wireless_data_rate_history_info.py
index 35f3f7531..70bbcbf5e 100644
--- a/plugins/modules/networks_wireless_data_rate_history_info.py
+++ b/plugins/modules/networks_wireless_data_rate_history_info.py
@@ -5,114 +5,118 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_data_rate_history_info
-short_description: Information module for networks _wireless _data _rate _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _data _rate _history.
-- Return PHY data rates over time for a network, device, or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _data _rate _history.
+  - Return PHY data rates over time for a network, device, or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_data_rate_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_data_rate_history,
+  - Paths used are get /networks/{networkId}/wireless/dataRateHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - ApTag query parameter. Filter results by AP tag.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - ClientId query parameter. Filter results by network client.
+      - ClientId query parameter. Filter results by network client.
     type: str
   deviceSerial:
     description:
-    - DeviceSerial query parameter. Filter results by device.
+      - DeviceSerial query parameter. Filter results by device.
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - ApTag query parameter. Filter results by AP tag.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   ssid:
     description:
-    - Ssid query parameter. Filter results by SSID number.
+      - Ssid query parameter. Filter results by SSID number.
     type: int
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
+    description:
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessDataRateHistory
-  description: Complete reference of the getNetworkWirelessDataRateHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-data-rate-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_data_rate_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/dataRateHistory,
+  - description: Complete reference of the getNetworkWirelessDataRateHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-data-rate-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessDataRateHistory
+short_description: Information module for networks _wireless _data _rate _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _data _rate _history
   cisco.meraki.networks_wireless_data_rate_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
@@ -120,7 +124,6 @@
     ssid: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_devices_connection_stats_info.py b/plugins/modules/networks_wireless_devices_connection_stats_info.py
index 2737c9e48..a805b83b1 100644
--- a/plugins/modules/networks_wireless_devices_connection_stats_info.py
+++ b/plugins/modules/networks_wireless_devices_connection_stats_info.py
@@ -5,94 +5,97 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_devices_connection_stats_info
-short_description: Information module for networks _wireless _devices _connection _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _devices _connection _stats.
-- Aggregated connectivity info for this network, grouped by node.
-version_added: '2.16.0'
+  - Get all networks _wireless _devices _connection _stats.
+  - Aggregated connectivity info for this network, grouped by node.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_devices_connection_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_devices_connection_stats,
+  - Paths used are get /networks/{networkId}/wireless/devices/connectionStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessDevicesConnectionStats
-  description: Complete reference of the getNetworkWirelessDevicesConnectionStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-devices-connection-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_devices_connection_stats,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/devices/connectionStats,
+  - description: Complete reference of the getNetworkWirelessDevicesConnectionStats
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-devices-connection-stats
+    name: Cisco Meraki documentation for wireless getNetworkWirelessDevicesConnectionStats
+short_description: Information module for networks _wireless _devices _connection
+  _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _devices _connection _stats
   cisco.meraki.networks_wireless_devices_connection_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -102,7 +105,6 @@
     apTag: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_electronic_shelf_label.py b/plugins/modules/networks_wireless_electronic_shelf_label.py
index 44dd35c64..d6c91122c 100644
--- a/plugins/modules/networks_wireless_electronic_shelf_label.py
+++ b/plugins/modules/networks_wireless_electronic_shelf_label.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_electronic_shelf_label
-short_description: Resource module for networks _wireless _electronic _shelf _label
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _electronic _shelf _label.
-- Update the ESL settings of a wireless network.
-version_added: '2.20.0'
+  - Manage operation update of the resource networks _wireless _electronic _shelf
+    _label.
+  - Update the ESL settings of a wireless network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_electronic_shelf_label
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_electronic_shelf_label,
+  - Paths used are put /networks/{networkId}/wireless/electronicShelfLabel,
 options:
   enabled:
     description: Turn ESL features on and off for this network.
@@ -26,48 +27,44 @@
     description: NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessElectronicShelfLabel
-  description: Complete reference of the updateNetworkWirelessElectronicShelfLabel API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-electronic-shelf-label
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_electronic_shelf_label,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/electronicShelfLabel,
+  - description: Complete reference of the updateNetworkWirelessElectronicShelfLabel
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-electronic-shelf-label
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessElectronicShelfLabel
+short_description: Resource module for networks _wireless _electronic _shelf _label
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_electronic_shelf_label:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     hostname: N_24329156
     networkId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_electronic_shelf_label_configured_devices_info.py b/plugins/modules/networks_wireless_electronic_shelf_label_configured_devices_info.py
index bf613394b..e39a213fb 100644
--- a/plugins/modules/networks_wireless_electronic_shelf_label_configured_devices_info.py
+++ b/plugins/modules/networks_wireless_electronic_shelf_label_configured_devices_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_electronic_shelf_label_configured_devices_info
-short_description: Information module for networks _wireless _electronic _shelf _label _configured _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _electronic _shelf _label _configured _devices.
-- Get a list of all ESL eligible devices of a network.
-version_added: '2.20.0'
+  - Get all networks _wireless _electronic _shelf _label _configured _devices.
+  - Get a list of all ESL eligible devices of a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_electronic_shelf_label_configured_devices_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_electronic_shelf_label_configured_devices,
+  - Paths used are get /networks/{networkId}/wireless/electronicShelfLabel/configuredDevices,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessElectronicShelfLabelConfiguredDevices
-  description: Complete reference of the getNetworkWirelessElectronicShelfLabelConfiguredDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-electronic-shelf-label-configured-devices
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_electronic_shelf_label_configured_devices,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/electronicShelfLabel/configuredDevices,
+  - description: Complete reference of the getNetworkWirelessElectronicShelfLabelConfiguredDevices
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-electronic-shelf-label-configured-devices
+    name: Cisco Meraki documentation for wireless getNetworkWirelessElectronicShelfLabelConfiguredDevices
+short_description: Information module for networks _wireless _electronic _shelf _label
+  _configured _devices
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _electronic _shelf _label _configured _devices
   cisco.meraki.networks_wireless_electronic_shelf_label_configured_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_electronic_shelf_label_info.py b/plugins/modules/networks_wireless_electronic_shelf_label_info.py
index 580a53dd0..c2c5fbfd5 100644
--- a/plugins/modules/networks_wireless_electronic_shelf_label_info.py
+++ b/plugins/modules/networks_wireless_electronic_shelf_label_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_electronic_shelf_label_info
-short_description: Information module for networks _wireless _electronic _shelf _label
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _electronic _shelf _label.
-- Return the ESL settings of a wireless network.
-version_added: '2.16.0'
+  - Get all networks _wireless _electronic _shelf _label.
+  - Return the ESL settings of a wireless network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_electronic_shelf_label_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_electronic_shelf_label,
+  - Paths used are get /networks/{networkId}/wireless/electronicShelfLabel,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessElectronicShelfLabel
-  description: Complete reference of the getNetworkWirelessElectronicShelfLabel API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-electronic-shelf-label
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_electronic_shelf_label,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/electronicShelfLabel,
+  - description: Complete reference of the getNetworkWirelessElectronicShelfLabel
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-electronic-shelf-label
+    name: Cisco Meraki documentation for wireless getNetworkWirelessElectronicShelfLabel
+short_description: Information module for networks _wireless _electronic _shelf _label
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _electronic _shelf _label
   cisco.meraki.networks_wireless_electronic_shelf_label_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ethernet_ports_profiles.py b/plugins/modules/networks_wireless_ethernet_ports_profiles.py
index e19cb7ddd..b6fc387cb 100644
--- a/plugins/modules/networks_wireless_ethernet_ports_profiles.py
+++ b/plugins/modules/networks_wireless_ethernet_ports_profiles.py
@@ -5,17 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ethernet_ports_profiles
-short_description: Resource module for networks _wireless _ethernet _ports _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations update and delete of the resource networks _wireless _ethernet _ports _profiles.
-- Delete an AP port profile.
-- Update the AP port profile by ID for this network.
-version_added: '2.16.0'
+  - Manage operations update and delete of the resource networks _wireless _ethernet
+    _ports _profiles.
+  - Delete an AP port profile.
+  - Update the AP port profile by ID for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ethernet_ports_profiles
+notes:
+  - SDK Method used are wireless.Wireless.delete_network_wireless_ethernet_ports_profile,
+    wireless.Wireless.update_network_wireless_ethernet_ports_profile,
+  - Paths used are delete /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
+    put /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
 options:
   name:
     description: AP port profile name.
@@ -58,88 +61,82 @@
         type: int
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless deleteNetworkWirelessEthernetPortsProfile
-  description: Complete reference of the deleteNetworkWirelessEthernetPortsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-ethernet-ports-profile
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessEthernetPortsProfile
-  description: Complete reference of the updateNetworkWirelessEthernetPortsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ethernet-ports-profile
-notes:
-  - SDK Method used are
-    wireless.Wireless.delete_network_wireless_ethernet_ports_profile,
-    wireless.Wireless.update_network_wireless_ethernet_ports_profile,
-
-  - Paths used are
-    delete /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
-    put /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
+  - description: Complete reference of the deleteNetworkWirelessEthernetPortsProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-ethernet-ports-profile
+    name: Cisco Meraki documentation for wireless deleteNetworkWirelessEthernetPortsProfile
+  - description: Complete reference of the updateNetworkWirelessEthernetPortsProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ethernet-ports-profile
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessEthernetPortsProfile
+short_description: Resource module for networks _wireless _ethernet _ports _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Delete by id
   cisco.meraki.networks_wireless_ethernet_ports_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     profileId: string
-
 - name: Update by id
   cisco.meraki.networks_wireless_ethernet_ports_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: string
     networkId: string
     ports:
-    - enabled: true
-      name: string
-      pskGroupId: string
-      ssid: 0
+      - enabled: true
+        name: string
+        pskGroupId: string
+        ssid: 0
     profileId: string
     usbPorts:
-    - enabled: true
-      name: string
-      ssid: 0
-
+      - enabled: true
+        name: string
+        ssid: 0
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ethernet_ports_profiles_assign.py b/plugins/modules/networks_wireless_ethernet_ports_profiles_assign.py
index 2a5a75505..a555438fe 100644
--- a/plugins/modules/networks_wireless_ethernet_ports_profiles_assign.py
+++ b/plugins/modules/networks_wireless_ethernet_ports_profiles_assign.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ethernet_ports_profiles_assign
-short_description: Resource module for networks _wireless _ethernet _ports _profiles _assign
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _wireless _ethernet _ports _profiles _assign.
-- Assign AP port profile to list of APs.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _wireless _ethernet _ports _profiles
+    _assign.
+  - Assign AP port profile to list of APs.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ethernet_ports_profiles_assign
+notes:
+  - SDK Method used are wireless.Wireless.assign_network_wireless_ethernet_ports_profiles,
+  - Paths used are post /networks/{networkId}/wireless/ethernet/ports/profiles/assign,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -27,50 +28,47 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless assignNetworkWirelessEthernetPortsProfiles
-  description: Complete reference of the assignNetworkWirelessEthernetPortsProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!assign-network-wireless-ethernet-ports-profiles
-notes:
-  - SDK Method used are
-    wireless.Wireless.assign_network_wireless_ethernet_ports_profiles,
-
-  - Paths used are
-    post /networks/{networkId}/wireless/ethernet/ports/profiles/assign,
+  - description: Complete reference of the assignNetworkWirelessEthernetPortsProfiles
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!assign-network-wireless-ethernet-ports-profiles
+    name: Cisco Meraki documentation for wireless assignNetworkWirelessEthernetPortsProfiles
+short_description: Resource module for networks _wireless _ethernet _ports _profiles
+  _assign
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_wireless_ethernet_ports_profiles_assign:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     profileId: '1001'
     serials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ethernet_ports_profiles_info.py b/plugins/modules/networks_wireless_ethernet_ports_profiles_info.py
index a502968db..530cc3a12 100644
--- a/plugins/modules/networks_wireless_ethernet_ports_profiles_info.py
+++ b/plugins/modules/networks_wireless_ethernet_ports_profiles_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ethernet_ports_profiles_info
-short_description: Information module for networks _wireless _ethernet _ports _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get networks _wireless _ethernet _ports _profiles by id.
-- Show the AP port profile by ID for this network.
-version_added: '2.16.0'
+  - Get networks _wireless _ethernet _ports _profiles by id.
+  - Show the AP port profile by ID for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ethernet_ports_profiles_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ethernet_ports_profile,
+  - Paths used are get /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   profileId:
     description:
-    - ProfileId path parameter. Profile ID.
+      - ProfileId path parameter. Profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessEthernetPortsProfile
-  description: Complete reference of the getNetworkWirelessEthernetPortsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ethernet-ports-profile
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ethernet_ports_profile,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ethernet/ports/profiles/{profileId},
+  - description: Complete reference of the getNetworkWirelessEthernetPortsProfile
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ethernet-ports-profile
+    name: Cisco Meraki documentation for wireless getNetworkWirelessEthernetPortsProfile
+short_description: Information module for networks _wireless _ethernet _ports _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get networks _wireless _ethernet _ports _profiles by id
   cisco.meraki.networks_wireless_ethernet_ports_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     profileId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ethernet_ports_profiles_set_default.py b/plugins/modules/networks_wireless_ethernet_ports_profiles_set_default.py
index 3368b04a2..98675639a 100644
--- a/plugins/modules/networks_wireless_ethernet_ports_profiles_set_default.py
+++ b/plugins/modules/networks_wireless_ethernet_ports_profiles_set_default.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ethernet_ports_profiles_set_default
-short_description: Resource module for networks _wireless _ethernet _ports _profiles _set _default
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource networks _wireless _ethernet _ports _profiles _set _default.
-- Set the AP port profile to be default for this network.
-version_added: '2.16.0'
+  - Manage operation create of the resource networks _wireless _ethernet _ports _profiles
+    _set _default.
+  - Set the AP port profile to be default for this network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ethernet_ports_profiles_set_default
+notes:
+  - SDK Method used are wireless.Wireless.set_network_wireless_ethernet_ports_profiles_default,
+  - Paths used are post /networks/{networkId}/wireless/ethernet/ports/profiles/setDefault,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -23,46 +24,43 @@
     description: AP profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless setNetworkWirelessEthernetPortsProfilesDefault
-  description: Complete reference of the setNetworkWirelessEthernetPortsProfilesDefault API.
-  link: https://developer.cisco.com/meraki/api-v1/#!set-network-wireless-ethernet-ports-profiles-default
-notes:
-  - SDK Method used are
-    wireless.Wireless.set_network_wireless_ethernet_ports_profiles_default,
-
-  - Paths used are
-    post /networks/{networkId}/wireless/ethernet/ports/profiles/setDefault,
+  - description: Complete reference of the setNetworkWirelessEthernetPortsProfilesDefault
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!set-network-wireless-ethernet-ports-profiles-default
+    name: Cisco Meraki documentation for wireless setNetworkWirelessEthernetPortsProfilesDefault
+short_description: Resource module for networks _wireless _ethernet _ports _profiles
+  _set _default
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_wireless_ethernet_ports_profiles_set_default:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     profileId: '1001'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_failed_connections_info.py b/plugins/modules/networks_wireless_failed_connections_info.py
index ce18bd7c5..bf42b8436 100644
--- a/plugins/modules/networks_wireless_failed_connections_info.py
+++ b/plugins/modules/networks_wireless_failed_connections_info.py
@@ -5,102 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_failed_connections_info
-short_description: Information module for networks _wireless _failed _connections
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _failed _connections.
-- List of all failed client connection events on this network in a given time range.
-version_added: '2.16.0'
+  - Get all networks _wireless _failed _connections.
+  - List of all failed client connection events on this network in a given time range.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_failed_connections_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_failed_connections,
+  - Paths used are get /networks/{networkId}/wireless/failedConnections,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
+  clientId:
+    description:
+      - ClientId query parameter. Filter by client MAC.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
+  serial:
+    description:
+      - Serial query parameter. Filter by AP.
+    type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
-  serial:
-    description:
-    - Serial query parameter. Filter by AP.
-    type: str
-  clientId:
-    description:
-    - ClientId query parameter. Filter by client MAC.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessFailedConnections
-  description: Complete reference of the getNetworkWirelessFailedConnections API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-failed-connections
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_failed_connections,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/failedConnections,
+  - description: Complete reference of the getNetworkWirelessFailedConnections API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-failed-connections
+    name: Cisco Meraki documentation for wireless getNetworkWirelessFailedConnections
+short_description: Information module for networks _wireless _failed _connections
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _failed _connections
   cisco.meraki.networks_wireless_failed_connections_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -112,7 +113,6 @@
     clientId: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_latency_history_info.py b/plugins/modules/networks_wireless_latency_history_info.py
index d8250ffef..b46841660 100644
--- a/plugins/modules/networks_wireless_latency_history_info.py
+++ b/plugins/modules/networks_wireless_latency_history_info.py
@@ -5,118 +5,122 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_latency_history_info
-short_description: Information module for networks _wireless _latency _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _latency _history.
-- Return average wireless latency over time for a network, device, or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _latency _history.
+  - Return average wireless latency over time for a network, device, or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_latency_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_latency_history,
+  - Paths used are get /networks/{networkId}/wireless/latencyHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
+  accessCategory:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - AccessCategory query parameter. Filter by access category.
     type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - ApTag query parameter. Filter results by AP tag.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - ClientId query parameter. Filter results by network client.
+      - ClientId query parameter. Filter results by network client.
     type: str
   deviceSerial:
     description:
-    - DeviceSerial query parameter. Filter results by device.
+      - DeviceSerial query parameter. Filter results by device.
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - ApTag query parameter. Filter results by AP tag.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   ssid:
     description:
-    - Ssid query parameter. Filter results by SSID number.
+      - Ssid query parameter. Filter results by SSID number.
     type: int
-  accessCategory:
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
     description:
-    - AccessCategory query parameter. Filter by access category.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessLatencyHistory
-  description: Complete reference of the getNetworkWirelessLatencyHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-latency-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_latency_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/latencyHistory,
+  - description: Complete reference of the getNetworkWirelessLatencyHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-latency-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessLatencyHistory
+short_description: Information module for networks _wireless _latency _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _latency _history
   cisco.meraki.networks_wireless_latency_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
@@ -125,7 +129,6 @@
     accessCategory: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_latency_stats_info.py b/plugins/modules/networks_wireless_latency_stats_info.py
index 5ea52b872..65b7d0f88 100644
--- a/plugins/modules/networks_wireless_latency_stats_info.py
+++ b/plugins/modules/networks_wireless_latency_stats_info.py
@@ -5,101 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_latency_stats_info
-short_description: Information module for networks _wireless _latency _stats
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _latency _stats.
-- Aggregated latency info for this network.
-version_added: '2.16.0'
+  - Get all networks _wireless _latency _stats.
+  - Aggregated latency info for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_latency_stats_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_latency_stats,
+  - Paths used are get /networks/{networkId}/wireless/latencyStats,
 options:
+  apTag:
+    description:
+      - ApTag query parameter. Filter results by AP Tag.
+    type: str
+  band:
+    description:
+      - 'Band query parameter. Filter results by band (either ''2.4'', ''5'' or ''6'').
+        Note that data prior to February 2020 will not have band information.
+
+        '
+    type: str
+  fields:
+    description:
+      - 'Fields query parameter. Partial selection If present, this call will return
+        only the selected fields of "rawDistribution", "avg". All fields will be returned
+        by default. Selected fields must be entered as a comma separated string.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
+  ssid:
+    description:
+      - Ssid query parameter. Filter results by SSID.
+    type: int
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 180 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 180 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days.
+
+        '
     type: float
-  band:
-    description:
-    - >
-      Band query parameter. Filter results by band (either '2.4', '5' or '6'). Note that data prior to February
-      2020 will not have band information.
-    type: str
-  ssid:
-    description:
-    - Ssid query parameter. Filter results by SSID.
-    type: int
   vlan:
     description:
-    - Vlan query parameter. Filter results by VLAN.
+      - Vlan query parameter. Filter results by VLAN.
     type: int
-  apTag:
-    description:
-    - ApTag query parameter. Filter results by AP Tag.
-    type: str
-  fields:
-    description:
-    - >
-      Fields query parameter. Partial selection If present, this call will return only the selected fields of
-      "rawDistribution", "avg". All fields will be returned by default. Selected fields must be entered as a comma
-      separated string.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessLatencyStats
-  description: Complete reference of the getNetworkWirelessLatencyStats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-latency-stats
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_latency_stats,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/latencyStats,
+  - description: Complete reference of the getNetworkWirelessLatencyStats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-latency-stats
+    name: Cisco Meraki documentation for wireless getNetworkWirelessLatencyStats
+short_description: Information module for networks _wireless _latency _stats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _latency _stats
   cisco.meraki.networks_wireless_latency_stats_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -110,7 +112,6 @@
     fields: string
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_mesh_statuses_info.py b/plugins/modules/networks_wireless_mesh_statuses_info.py
index e012ee252..58066a7d9 100644
--- a/plugins/modules/networks_wireless_mesh_statuses_info.py
+++ b/plugins/modules/networks_wireless_mesh_statuses_info.py
@@ -5,81 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_mesh_statuses_info
-short_description: Information module for networks _wireless _mesh _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _mesh _statuses.
-- List wireless mesh statuses for repeaters.
-version_added: '2.16.0'
+  - Get all networks _wireless _mesh _statuses.
+  - List wireless mesh statuses for repeaters.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_mesh_statuses_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_mesh_statuses,
+  - Paths used are get /networks/{networkId}/wireless/meshStatuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 500. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 500. Default is 50.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessMeshStatuses
-  description: Complete reference of the getNetworkWirelessMeshStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-mesh-statuses
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_mesh_statuses,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/meshStatuses,
+  - description: Complete reference of the getNetworkWirelessMeshStatuses API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-mesh-statuses
+    name: Cisco Meraki documentation for wireless getNetworkWirelessMeshStatuses
+short_description: Information module for networks _wireless _mesh _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _mesh _statuses
   cisco.meraki.networks_wireless_mesh_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +90,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_rf_profiles.py b/plugins/modules/networks_wireless_rf_profiles.py
index 78f6646fb..983df9089 100644
--- a/plugins/modules/networks_wireless_rf_profiles.py
+++ b/plugins/modules/networks_wireless_rf_profiles.py
@@ -5,20 +5,24 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_rf_profiles
-short_description: Resource module for networks _wireless _rf _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _wireless _rf _profiles.
-- Creates new RF profile for this network.
-- Delete a RF Profile.
-- >
-   Updates specified RF profile for this network. Note built-in RF profiles can only be assigned as a default, and
-   its attributes are immutable.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _wireless
+    _rf _profiles.
+  - Creates new RF profile for this network.
+  - Delete a RF Profile.
+  - 'Updates specified RF profile for this network. Note built-in RF profiles can
+    only be assigned as a default, and its attributes are immutable.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_rf_profiles
+notes:
+  - SDK Method used are wireless.Wireless.create_network_wireless_rf_profile, wireless.Wireless.delete_network_wireless_rf_profile,
+    wireless.Wireless.update_network_wireless_rf_profile,
+  - Paths used are post /networks/{networkId}/wireless/rfProfiles, delete /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
+    put /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
 options:
   apBandSettings:
     description: Settings that will be enabled if selectionType is set to 'ap'.
@@ -28,8 +32,8 @@
           to dual.
         type: str
       bandSteeringEnabled:
-        description: Steers client to most open band. Can be either true or false. Defaults
-          to true.
+        description: Steers client to most open band. Can be either true or false.
+          Defaults to true.
         type: bool
       bands:
         description: Settings related to all bands.
@@ -41,44 +45,44 @@
         type: dict
     type: dict
   bandSelectionType:
-    description: Band selection can be set to either 'ssid' or 'ap'. This param is required
-      on creation.
+    description: Band selection can be set to either 'ssid' or 'ap'. This param is
+      required on creation.
     type: str
   clientBalancingEnabled:
-    description: Steers client to best available access point. Can be either true or
-      false. Defaults to true.
+    description: Steers client to best available access point. Can be either true
+      or false. Defaults to true.
     type: bool
   fiveGhzSettings:
     description: Settings related to 5Ghz band.
     suboptions:
       channelWidth:
-        description: Sets channel width (MHz) for 5Ghz band. Can be one of 'auto', '20',
-          '40' or '80'. Defaults to auto.
+        description: Sets channel width (MHz) for 5Ghz band. Can be one of 'auto',
+          '20', '40' or '80'. Defaults to auto.
         type: str
       maxPower:
         description: Sets max power (dBm) of 5Ghz band. Can be integer between 2 and
           30. Defaults to 30.
         type: int
       minBitrate:
-        description: Sets min bitrate (Mbps) of 5Ghz band. Can be one of '6', '9', '12',
-          '18', '24', '36', '48' or '54'. Defaults to 12.
+        description: Sets min bitrate (Mbps) of 5Ghz band. Can be one of '6', '9',
+          '12', '18', '24', '36', '48' or '54'. Defaults to 12.
         type: int
       minPower:
         description: Sets min power (dBm) of 5Ghz band. Can be integer between 2 and
           30. Defaults to 8.
         type: int
       rxsop:
-        description: The RX-SOP level controls the sensitivity of the radio. It is strongly
-          recommended to use RX-SOP only after consulting a wireless expert. RX-SOP
-          can be configured in the range of -65 to -95 (dBm). A value of null will reset
-          this to the default.
+        description: The RX-SOP level controls the sensitivity of the radio. It is
+          strongly recommended to use RX-SOP only after consulting a wireless expert.
+          RX-SOP can be configured in the range of -65 to -95 (dBm). A value of null
+          will reset this to the default.
         type: int
       validAutoChannels:
         description: Sets valid auto channels for 5Ghz band. Can be one of '36', '40',
           '44', '48', '52', '56', '60', '64', '100', '104', '108', '112', '116', '120',
-          '124', '128', '132', '136', '140', '144', '149', '153', '157', '161' or '165'.Defaults
-          to 36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128,
-          132, 136, 140, 144, 149, 153, 157, 161, 165.
+          '124', '128', '132', '136', '140', '144', '149', '153', '157', '161' or
+          '165'.Defaults to 36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116,
+          120, 124, 128, 132, 136, 140, 144, 149, 153, 157, 161, 165.
         elements: int
         type: list
     type: dict
@@ -100,14 +104,14 @@
         type: list
     type: dict
   isIndoorDefault:
-    description: Set this profile as the default indoor rf profile. If the profile ID
-      is one of 'indoor' or 'outdoor', then a new profile will be created from the respective
-      ID and set as the default.
+    description: Set this profile as the default indoor rf profile. If the profile
+      ID is one of 'indoor' or 'outdoor', then a new profile will be created from
+      the respective ID and set as the default.
     type: bool
   isOutdoorDefault:
     description: Set this profile as the default outdoor rf profile. If the profile
-      ID is one of 'indoor' or 'outdoor', then a new profile will be created from the
-      respective ID and set as the default.
+      ID is one of 'indoor' or 'outdoor', then a new profile will be created from
+      the respective ID and set as the default.
     type: bool
   minBitrateType:
     description: Minimum bitrate can be set to either 'band' or 'ssid'. Defaults to
@@ -142,8 +146,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '1':
@@ -165,8 +169,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '10':
@@ -188,8 +192,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '11':
@@ -211,8 +215,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '12':
@@ -234,8 +238,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '13':
@@ -257,8 +261,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '14':
@@ -280,8 +284,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '2':
@@ -303,8 +307,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '3':
@@ -326,8 +330,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '4':
@@ -349,8 +353,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '5':
@@ -372,8 +376,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '6':
@@ -395,8 +399,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '7':
@@ -418,8 +422,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '8':
@@ -441,8 +445,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
       '9':
@@ -464,8 +468,8 @@
                 type: list
             type: dict
           minBitrate:
-            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1', '2',
-              '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
+            description: Sets min bitrate (Mbps) of this SSID. Can be one of '1',
+              '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'.
             type: float
         type: dict
     type: dict
@@ -485,18 +489,18 @@
           30. Defaults to 30.
         type: int
       minBitrate:
-        description: Sets min bitrate (Mbps) of 6Ghz band. Can be one of '6', '9', '12',
-          '18', '24', '36', '48' or '54'. Defaults to 12.
+        description: Sets min bitrate (Mbps) of 6Ghz band. Can be one of '6', '9',
+          '12', '18', '24', '36', '48' or '54'. Defaults to 12.
         type: int
       minPower:
         description: Sets min power (dBm) of 6Ghz band. Can be integer between 2 and
           30. Defaults to 8.
         type: int
       rxsop:
-        description: The RX-SOP level controls the sensitivity of the radio. It is strongly
-          recommended to use RX-SOP only after consulting a wireless expert. RX-SOP
-          can be configured in the range of -65 to -95 (dBm). A value of null will reset
-          this to the default.
+        description: The RX-SOP level controls the sensitivity of the radio. It is
+          strongly recommended to use RX-SOP only after consulting a wireless expert.
+          RX-SOP can be configured in the range of -65 to -95 (dBm). A value of null
+          will reset this to the default.
         type: int
       validAutoChannels:
         description: Sets valid auto channels for 6Ghz band. Can be one of '1', '5',
@@ -505,10 +509,10 @@
           '109', '113', '117', '121', '125', '129', '133', '137', '141', '145', '149',
           '153', '157', '161', '165', '169', '173', '177', '181', '185', '189', '193',
           '197', '201', '205', '209', '213', '217', '221', '225', '229' or '233'.Defaults
-          to 1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61, 65, 69, 73,
-          77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 129, 133, 137,
-          141, 145, 149, 153, 157, 161, 165, 169, 173, 177, 181, 185, 189, 193, 197,
-          201, 205, 209, 213, 217, 221, 225, 229, 233.
+          to 1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61, 65, 69,
+          73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 129, 133,
+          137, 141, 145, 149, 153, 157, 161, 165, 169, 173, 177, 181, 185, 189, 193,
+          197, 201, 205, 209, 213, 217, 221, 225, 229, 233.
         elements: int
         type: list
     type: dict
@@ -524,90 +528,83 @@
     description: Settings related to 2.4Ghz band.
     suboptions:
       axEnabled:
-        description: Determines whether ax radio on 2.4Ghz band is on or off. Can be
-          either true or false. If false, we highly recommend disabling band steering.
+        description: Determines whether ax radio on 2.4Ghz band is on or off. Can
+          be either true or false. If false, we highly recommend disabling band steering.
           Defaults to true.
         type: bool
       maxPower:
-        description: Sets max power (dBm) of 2.4Ghz band. Can be integer between 2 and
-          30. Defaults to 30.
+        description: Sets max power (dBm) of 2.4Ghz band. Can be integer between 2
+          and 30. Defaults to 30.
         type: int
       minBitrate:
         description: Sets min bitrate (Mbps) of 2.4Ghz band. Can be one of '1', '2',
-          '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'. Defaults to 11.
+          '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54'. Defaults to
+          11.
         type: float
       minPower:
-        description: Sets min power (dBm) of 2.4Ghz band. Can be integer between 2 and
-          30. Defaults to 5.
+        description: Sets min power (dBm) of 2.4Ghz band. Can be integer between 2
+          and 30. Defaults to 5.
         type: int
       rxsop:
-        description: The RX-SOP level controls the sensitivity of the radio. It is strongly
-          recommended to use RX-SOP only after consulting a wireless expert. RX-SOP
-          can be configured in the range of -65 to -95 (dBm). A value of null will reset
-          this to the default.
+        description: The RX-SOP level controls the sensitivity of the radio. It is
+          strongly recommended to use RX-SOP only after consulting a wireless expert.
+          RX-SOP can be configured in the range of -65 to -95 (dBm). A value of null
+          will reset this to the default.
         type: int
       validAutoChannels:
-        description: Sets valid auto channels for 2.4Ghz band. Can be one of '1', '6'
-          or '11'. Defaults to 1, 6, 11.
+        description: Sets valid auto channels for 2.4Ghz band. Can be one of '1',
+          '6' or '11'. Defaults to 1, 6, 11.
         elements: int
         type: list
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless createNetworkWirelessRfProfile
-  description: Complete reference of the createNetworkWirelessRfProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-rf-profile
-- name: Cisco Meraki documentation for wireless deleteNetworkWirelessRfProfile
-  description: Complete reference of the deleteNetworkWirelessRfProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-rf-profile
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessRfProfile
-  description: Complete reference of the updateNetworkWirelessRfProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-rf-profile
-notes:
-  - SDK Method used are
-    wireless.Wireless.create_network_wireless_rf_profile,
-    wireless.Wireless.delete_network_wireless_rf_profile,
-    wireless.Wireless.update_network_wireless_rf_profile,
-
-  - Paths used are
-    post /networks/{networkId}/wireless/rfProfiles,
-    delete /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
-    put /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
+  - description: Complete reference of the createNetworkWirelessRfProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-rf-profile
+    name: Cisco Meraki documentation for wireless createNetworkWirelessRfProfile
+  - description: Complete reference of the deleteNetworkWirelessRfProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-rf-profile
+    name: Cisco Meraki documentation for wireless deleteNetworkWirelessRfProfile
+  - description: Complete reference of the updateNetworkWirelessRfProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-rf-profile
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessRfProfile
+short_description: Resource module for networks _wireless _rf _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_wireless_rf_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     apBandSettings:
       bandOperationMode: dual
       bandSteeringEnabled: true
       bands:
         enabled:
-        - '2.4'
-        - '5'
+          - '2.4'
+          - '5'
     bandSelectionType: ap
     clientBalancingEnabled: true
     fiveGhzSettings:
@@ -617,36 +614,36 @@
       minPower: 8
       rxsop: -95
       validAutoChannels:
-      - 36
-      - 40
-      - 44
-      - 48
-      - 52
-      - 56
-      - 60
-      - 64
-      - 100
-      - 104
-      - 108
-      - 112
-      - 116
-      - 120
-      - 124
-      - 128
-      - 132
-      - 136
-      - 140
-      - 144
-      - 149
-      - 153
-      - 157
-      - 161
-      - 165
+        - 36
+        - 40
+        - 44
+        - 48
+        - 52
+        - 56
+        - 60
+        - 64
+        - 100
+        - 104
+        - 108
+        - 112
+        - 116
+        - 120
+        - 124
+        - 128
+        - 132
+        - 136
+        - 140
+        - 144
+        - 149
+        - 153
+        - 157
+        - 161
+        - 165
     flexRadios:
       byModel:
-      - bands:
-        - '5'
-        model: MR34
+        - bands:
+            - '5'
+          model: MR34
     minBitrateType: band
     name: Main Office
     networkId: string
@@ -656,120 +653,120 @@
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '1':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '10':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '11':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '12':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '13':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '14':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '2':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '3':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '4':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '5':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '6':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '7':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '8':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '9':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
     sixGhzSettings:
       channelWidth: auto
@@ -778,65 +775,65 @@
       minPower: 8
       rxsop: -95
       validAutoChannels:
-      - 1
-      - 5
-      - 9
-      - 13
-      - 17
-      - 21
-      - 25
-      - 29
-      - 33
-      - 37
-      - 41
-      - 45
-      - 49
-      - 53
-      - 57
-      - 61
-      - 65
-      - 69
-      - 73
-      - 77
-      - 81
-      - 85
-      - 89
-      - 93
-      - 97
-      - 101
-      - 105
-      - 109
-      - 113
-      - 117
-      - 121
-      - 125
-      - 129
-      - 133
-      - 137
-      - 141
-      - 145
-      - 149
-      - 153
-      - 157
-      - 161
-      - 165
-      - 169
-      - 173
-      - 177
-      - 181
-      - 185
-      - 189
-      - 193
-      - 197
-      - 201
-      - 205
-      - 209
-      - 213
-      - 217
-      - 221
-      - 225
-      - 229
-      - 233
+        - 1
+        - 5
+        - 9
+        - 13
+        - 17
+        - 21
+        - 25
+        - 29
+        - 33
+        - 37
+        - 41
+        - 45
+        - 49
+        - 53
+        - 57
+        - 61
+        - 65
+        - 69
+        - 73
+        - 77
+        - 81
+        - 85
+        - 89
+        - 93
+        - 97
+        - 101
+        - 105
+        - 109
+        - 113
+        - 117
+        - 121
+        - 125
+        - 129
+        - 133
+        - 137
+        - 141
+        - 145
+        - 149
+        - 153
+        - 157
+        - 161
+        - 165
+        - 169
+        - 173
+        - 177
+        - 181
+        - 185
+        - 189
+        - 193
+        - 197
+        - 201
+        - 205
+        - 209
+        - 213
+        - 217
+        - 221
+        - 225
+        - 229
+        - 233
     transmission:
       enabled: true
     twoFourGhzSettings:
@@ -846,66 +843,64 @@
       minPower: 5
       rxsop: -95
       validAutoChannels:
-      - 1
-      - 6
-      - 11
-
+        - 1
+        - 6
+        - 11
 - name: Delete by id
   cisco.meraki.networks_wireless_rf_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     networkId: string
     rfProfileId: string
-
 - name: Update by id
   cisco.meraki.networks_wireless_rf_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     apBandSettings:
       bandOperationMode: dual
       bandSteeringEnabled: true
       bands:
         enabled:
-        - '2.4'
-        - '5'
+          - '2.4'
+          - '5'
     bandSelectionType: ap
     clientBalancingEnabled: true
     fiveGhzSettings:
@@ -915,36 +910,36 @@
       minPower: 8
       rxsop: -95
       validAutoChannels:
-      - 36
-      - 40
-      - 44
-      - 48
-      - 52
-      - 56
-      - 60
-      - 64
-      - 100
-      - 104
-      - 108
-      - 112
-      - 116
-      - 120
-      - 124
-      - 128
-      - 132
-      - 136
-      - 140
-      - 144
-      - 149
-      - 153
-      - 157
-      - 161
-      - 165
+        - 36
+        - 40
+        - 44
+        - 48
+        - 52
+        - 56
+        - 60
+        - 64
+        - 100
+        - 104
+        - 108
+        - 112
+        - 116
+        - 120
+        - 124
+        - 128
+        - 132
+        - 136
+        - 140
+        - 144
+        - 149
+        - 153
+        - 157
+        - 161
+        - 165
     flexRadios:
       byModel:
-      - bands:
-        - '5'
-        model: MR34
+        - bands:
+            - '5'
+          model: MR34
     isIndoorDefault: true
     isOutdoorDefault: true
     minBitrateType: band
@@ -956,120 +951,120 @@
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '1':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '10':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '11':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '12':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '13':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '14':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '2':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '3':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '4':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '5':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '6':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '7':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '8':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
       '9':
         bandOperationMode: dual
         bandSteeringEnabled: true
         bands:
           enabled:
-          - '2.4'
-          - '5'
+            - '2.4'
+            - '5'
         minBitrate: 11.0
     rfProfileId: string
     sixGhzSettings:
@@ -1079,65 +1074,65 @@
       minPower: 8
       rxsop: -95
       validAutoChannels:
-      - 1
-      - 5
-      - 9
-      - 13
-      - 17
-      - 21
-      - 25
-      - 29
-      - 33
-      - 37
-      - 41
-      - 45
-      - 49
-      - 53
-      - 57
-      - 61
-      - 65
-      - 69
-      - 73
-      - 77
-      - 81
-      - 85
-      - 89
-      - 93
-      - 97
-      - 101
-      - 105
-      - 109
-      - 113
-      - 117
-      - 121
-      - 125
-      - 129
-      - 133
-      - 137
-      - 141
-      - 145
-      - 149
-      - 153
-      - 157
-      - 161
-      - 165
-      - 169
-      - 173
-      - 177
-      - 181
-      - 185
-      - 189
-      - 193
-      - 197
-      - 201
-      - 205
-      - 209
-      - 213
-      - 217
-      - 221
-      - 225
-      - 229
-      - 233
+        - 1
+        - 5
+        - 9
+        - 13
+        - 17
+        - 21
+        - 25
+        - 29
+        - 33
+        - 37
+        - 41
+        - 45
+        - 49
+        - 53
+        - 57
+        - 61
+        - 65
+        - 69
+        - 73
+        - 77
+        - 81
+        - 85
+        - 89
+        - 93
+        - 97
+        - 101
+        - 105
+        - 109
+        - 113
+        - 117
+        - 121
+        - 125
+        - 129
+        - 133
+        - 137
+        - 141
+        - 145
+        - 149
+        - 153
+        - 157
+        - 161
+        - 165
+        - 169
+        - 173
+        - 177
+        - 181
+        - 185
+        - 189
+        - 193
+        - 197
+        - 201
+        - 205
+        - 209
+        - 213
+        - 217
+        - 221
+        - 225
+        - 229
+        - 233
     transmission:
       enabled: true
     twoFourGhzSettings:
@@ -1147,10 +1142,9 @@
       minPower: 5
       rxsop: -95
       validAutoChannels:
-      - 1
-      - 6
-      - 11
-
+        - 1
+        - 6
+        - 11
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_rf_profiles_info.py b/plugins/modules/networks_wireless_rf_profiles_info.py
index 97b98431d..7b95df912 100644
--- a/plugins/modules/networks_wireless_rf_profiles_info.py
+++ b/plugins/modules/networks_wireless_rf_profiles_info.py
@@ -5,110 +5,104 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_rf_profiles_info
-short_description: Information module for networks _wireless _rf _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _rf _profiles.
-- Get networks _wireless _rf _profiles by id.
-- List RF profiles for this network.
-- Return a RF profile.
-version_added: '2.16.0'
+  - Get all networks _wireless _rf _profiles.
+  - Get networks _wireless _rf _profiles by id.
+  - List RF profiles for this network.
+  - Return a RF profile.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_rf_profiles_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_rf_profile, wireless.Wireless.get_network_wireless_rf_profiles,
+  - Paths used are get /networks/{networkId}/wireless/rfProfiles, get /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
   includeTemplateProfiles:
     description:
-    - >
-      IncludeTemplateProfiles query parameter. If the network is bound to a template, this parameter controls
-      whether or not the non-basic RF profiles defined on the template should be included in the response
-      alongside the non-basic profiles defined on the bound network. Defaults to false.
+      - 'IncludeTemplateProfiles query parameter. If the network is bound to a template,
+        this parameter controls whether or not the non-basic RF profiles defined on
+        the template should be included in the response alongside the non-basic profiles
+        defined on the bound network. Defaults to false.
+
+        '
     type: bool
+  networkId:
+    description:
+      - NetworkId path parameter. Network ID.
+    type: str
   rfProfileId:
     description:
-    - RfProfileId path parameter. Rf profile ID.
+      - RfProfileId path parameter. Rf profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessRfProfile
-  description: Complete reference of the getNetworkWirelessRfProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-rf-profile
-- name: Cisco Meraki documentation for wireless getNetworkWirelessRfProfiles
-  description: Complete reference of the getNetworkWirelessRfProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-rf-profiles
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_rf_profile,
-    wireless.Wireless.get_network_wireless_rf_profiles,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/rfProfiles,
-    get /networks/{networkId}/wireless/rfProfiles/{rfProfileId},
+  - description: Complete reference of the getNetworkWirelessRfProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-rf-profile
+    name: Cisco Meraki documentation for wireless getNetworkWirelessRfProfile
+  - description: Complete reference of the getNetworkWirelessRfProfiles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-rf-profiles
+    name: Cisco Meraki documentation for wireless getNetworkWirelessRfProfiles
+short_description: Information module for networks _wireless _rf _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _rf _profiles
   cisco.meraki.networks_wireless_rf_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
-    includeTemplateProfiles: True
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
+    includeTemplateProfiles: true
     networkId: string
   register: result
-
 - name: Get networks _wireless _rf _profiles by id
   cisco.meraki.networks_wireless_rf_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     rfProfileId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_settings.py b/plugins/modules/networks_wireless_settings.py
index 789748bb5..b95412189 100644
--- a/plugins/modules/networks_wireless_settings.py
+++ b/plugins/modules/networks_wireless_settings.py
@@ -5,20 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_settings
-short_description: Resource module for networks _wireless _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _settings.
-- Update the wireless settings for a network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _settings.
+  - Update the wireless settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_settings,
+  - Paths used are put /networks/{networkId}/wireless/settings,
 options:
   ipv6BridgeEnabled:
-    description: Toggle for enabling or disabling IPv6 bridging in a network (Note if
-      enabled, SSIDs must also be configured to use bridge mode).
+    description: Toggle for enabling or disabling IPv6 bridging in a network (Note
+      if enabled, SSIDs must also be configured to use bridge mode).
     type: bool
   ledLightsOn:
     description: Toggle for enabling or disabling LED lights on all APs in the network
@@ -51,47 +51,43 @@
     description: NetworkId path parameter. Network ID.
     type: str
   upgradeStrategy:
-    description: The default strategy that network devices will use to perform an upgrade.
-      Requires firmware version MR 26.8 or higher.
+    description: The default strategy that network devices will use to perform an
+      upgrade. Requires firmware version MR 26.8 or higher.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSettings
-  description: Complete reference of the updateNetworkWirelessSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_settings,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/settings,
+  - description: Complete reference of the updateNetworkWirelessSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-settings
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSettings
+short_description: Resource module for networks _wireless _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     ipv6BridgeEnabled: false
     ledLightsOn: false
@@ -103,7 +99,6 @@
         enabled: true
     networkId: string
     upgradeStrategy: minimizeUpgradeTime
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_settings_info.py b/plugins/modules/networks_wireless_settings_info.py
index 56f3a698e..f7a8d14fd 100644
--- a/plugins/modules/networks_wireless_settings_info.py
+++ b/plugins/modules/networks_wireless_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_settings_info
-short_description: Information module for networks _wireless _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _settings.
-- Return the wireless settings for a network.
-version_added: '2.16.0'
+  - Get all networks _wireless _settings.
+  - Return the wireless settings for a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_settings_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_settings,
+  - Paths used are get /networks/{networkId}/wireless/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSettings
-  description: Complete reference of the getNetworkWirelessSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_settings,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/settings,
+  - description: Complete reference of the getNetworkWirelessSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-settings
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSettings
+short_description: Information module for networks _wireless _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _settings
   cisco.meraki.networks_wireless_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_signal_quality_history_info.py b/plugins/modules/networks_wireless_signal_quality_history_info.py
index 724194e74..809a4f50d 100644
--- a/plugins/modules/networks_wireless_signal_quality_history_info.py
+++ b/plugins/modules/networks_wireless_signal_quality_history_info.py
@@ -5,114 +5,120 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_signal_quality_history_info
-short_description: Information module for networks _wireless _signal _quality _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _signal _quality _history.
-- Return signal quality SNR/RSSI over time for a device or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _signal _quality _history.
+  - Return signal quality SNR/RSSI over time for a device or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_signal_quality_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_signal_quality_history,
+  - Paths used are get /networks/{networkId}/wireless/signalQualityHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - ApTag query parameter. Filter results by AP tag; either clientId or deviceSerial
+        must be jointly specified.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - ClientId query parameter. Filter results by network client.
+      - ClientId query parameter. Filter results by network client.
     type: str
   deviceSerial:
     description:
-    - DeviceSerial query parameter. Filter results by device.
+      - DeviceSerial query parameter. Filter results by device.
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - ApTag query parameter. Filter results by AP tag; either clientId or deviceSerial must be jointly specified.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   ssid:
     description:
-    - Ssid query parameter. Filter results by SSID number.
+      - Ssid query parameter. Filter results by SSID number.
     type: int
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
+    description:
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSignalQualityHistory
-  description: Complete reference of the getNetworkWirelessSignalQualityHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-signal-quality-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_signal_quality_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/signalQualityHistory,
+  - description: Complete reference of the getNetworkWirelessSignalQualityHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-signal-quality-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSignalQualityHistory
+short_description: Information module for networks _wireless _signal _quality _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _signal _quality _history
   cisco.meraki.networks_wireless_signal_quality_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
@@ -120,7 +126,6 @@
     ssid: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids.py b/plugins/modules/networks_wireless_ssids.py
index 49f11f3cd..42c330b2e 100644
--- a/plugins/modules/networks_wireless_ssids.py
+++ b/plugins/modules/networks_wireless_ssids.py
@@ -5,26 +5,26 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids
-short_description: Resource module for networks _wireless _ssids
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids.
-- Update the attributes of an MR SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids.
+  - Update the attributes of an MR SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number},
 options:
   activeDirectory:
     description: The current setting for Active Directory. Only valid if splashPage
       is 'Password-protected with Active Directory'.
     suboptions:
       credentials:
-        description: (Optional) The credentials of the user account to be used by the
-          AP to bind to your Active Directory server. The Active Directory account should
-          have permissions on all your Active Directory servers. Only valid if the splashPage
-          is 'Password-protected with Active Directory'.
+        description: (Optional) The credentials of the user account to be used by
+          the AP to bind to your Active Directory server. The Active Directory account
+          should have permissions on all your Active Directory servers. Only valid
+          if the splashPage is 'Password-protected with Active Directory'.
         suboptions:
           logonName:
             description: The logon name of the Active Directory account.
@@ -80,8 +80,8 @@
       if the SSID has availability tags.
     type: bool
   bandSelection:
-    description: The client-serving radio frequencies of this SSID in the default indoor
-      RF profile. ('Dual band operation', '5 GHz band only' or 'Dual band operation
+    description: The client-serving radio frequencies of this SSID in the default
+      indoor RF profile. ('Dual band operation', '5 GHz band only' or 'Dual band operation
       with Band Steering').
     type: str
   concentratorNetworkId:
@@ -89,8 +89,8 @@
       with a concentrator' or 'VPN'.
     type: str
   defaultVlanId:
-    description: The default VLAN ID used for 'all other APs'. This param is only valid
-      when the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'.
+    description: The default VLAN ID used for 'all other APs'. This param is only
+      valid when the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'.
     type: int
   disassociateClientsOnVpnFailover:
     description: Disassociate clients when 'VPN' concentrator failover occurs in order
@@ -133,8 +133,8 @@
     description: Whether or not the SSID is enabled.
     type: bool
   encryptionMode:
-    description: The psk encryption mode for the SSID ('wep' or 'wpa'). This param is
-      only valid if the authMode is 'psk'.
+    description: The psk encryption mode for the SSID ('wep' or 'wpa'). This param
+      is only valid if the authMode is 'psk'.
     type: str
   enterpriseAdminAccess:
     description: Whether or not an SSID is accessible by 'enterprise' administrators
@@ -152,13 +152,14 @@
             type: str
         type: dict
       key:
-        description: Optional numerical identifier that will add the GRE key field to
-          the GRE header. Used to identify an individual traffic flow within a tunnel.
+        description: Optional numerical identifier that will add the GRE key field
+          to the GRE header. Used to identify an individual traffic flow within a
+          tunnel.
         type: int
     type: dict
   ipAssignmentMode:
-    description: The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3
-      roaming', 'Ethernet over GRE', 'Layer 3 roaming with a concentrator' or 'VPN').
+    description: The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer
+      3 roaming', 'Ethernet over GRE', 'Layer 3 roaming with a concentrator' or 'VPN').
     type: str
   lanIsolationEnabled:
     description: Boolean indicating whether Layer 2 LAN isolation should be enabled
@@ -172,12 +173,13 @@
         description: The base distinguished name of users on the LDAP server.
         type: str
       credentials:
-        description: (Optional) The credentials of the user account to be used by the
-          AP to bind to your LDAP server. The LDAP account should have permissions on
-          all your LDAP servers.
+        description: (Optional) The credentials of the user account to be used by
+          the AP to bind to your LDAP server. The LDAP account should have permissions
+          on all your LDAP servers.
         suboptions:
           distinguishedName:
-            description: The distinguished name of the LDAP user account (example cn=user,dc=meraki,dc=com).
+            description: The distinguished name of the LDAP user account (example
+              cn=user,dc=meraki,dc=com).
             type: str
           password:
             description: The password of the LDAP user account.
@@ -187,7 +189,8 @@
         description: The CA certificate used to sign the LDAP server's key.
         suboptions:
           contents:
-            description: The contents of the CA certificate. Must be in PEM or DER format.
+            description: The contents of the CA certificate. Must be in PEM or DER
+              format.
             type: str
         type: dict
       servers:
@@ -207,7 +210,8 @@
       on the access point. Only valid if authMode is '8021x-localradius'.
     suboptions:
       cacheTimeout:
-        description: The duration (in seconds) for which LDAP and OCSP lookups are cached.
+        description: The duration (in seconds) for which LDAP and OCSP lookups are
+          cached.
         type: int
       certificateAuthentication:
         description: The current setting for certificate verification.
@@ -216,8 +220,8 @@
             description: The Client CA Certificate used to sign the client certificate.
             suboptions:
               contents:
-                description: The contents of the Client CA Certificate. Must be in PEM
-                  or DER format.
+                description: The contents of the Client CA Certificate. Must be in
+                  PEM or DER format.
                 type: str
             type: dict
           enabled:
@@ -225,8 +229,8 @@
               to validate wireless clients.
             type: bool
           ocspResponderUrl:
-            description: (Optional) The URL of the OCSP responder to verify client certificate
-              status.
+            description: (Optional) The URL of the OCSP responder to verify client
+              certificate status.
             type: str
           useLdap:
             description: Whether or not to verify the certificate with LDAP.
@@ -246,12 +250,12 @@
     type: dict
   mandatoryDhcpEnabled:
     description: If true, Mandatory DHCP will enforce that clients connecting to this
-      SSID must use the IP address assigned by the DHCP server. Clients who use a static
-      IP address won't be able to associate.
+      SSID must use the IP address assigned by the DHCP server. Clients who use a
+      static IP address won't be able to associate.
     type: bool
   minBitrate:
-    description: The minimum bitrate in Mbps of this SSID in the default indoor RF profile.
-      ('1', '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54').
+    description: The minimum bitrate in Mbps of this SSID in the default indoor RF
+      profile. ('1', '2', '5.5', '6', '9', '11', '12', '18', '24', '36', '48' or '54').
     type: float
   name:
     description: The name of the SSID.
@@ -295,12 +299,12 @@
                 type: str
             type: list
           defaultVlanName:
-            description: The default VLAN name used to tag traffic in the absence of
-              a matching AP tag.
+            description: The default VLAN name used to tag traffic in the absence
+              of a matching AP tag.
             type: str
           enabled:
-            description: Whether or not traffic should be directed to use specific VLAN
-              names.
+            description: Whether or not traffic should be directed to use specific
+              VLAN names.
             type: bool
         type: dict
     type: dict
@@ -364,8 +368,8 @@
           server. Requires radiusProxyEnabled.
         type: bool
       secret:
-        description: Shared key used to authenticate messages between the APs and RADIUS
-          server.
+        description: Shared key used to authenticate messages between the APs and
+          RADIUS server.
         type: str
     type: list
   radiusAttributeForGroupPolicies:
@@ -401,8 +405,9 @@
       or 'nat' mode.
     type: bool
   radiusGuestVlanId:
-    description: VLAN ID of the RADIUS Guest VLAN. This param is only valid if the authMode
-      is 'open-with-radius' and addressing mode is not set to 'isolated' or 'nat' mode.
+    description: VLAN ID of the RADIUS Guest VLAN. This param is only valid if the
+      authMode is 'open-with-radius' and addressing mode is not set to 'isolated'
+      or 'nat' mode.
     type: int
   radiusLoadBalancingPolicy:
     description: This policy determines which RADIUS server will be contacted first
@@ -457,8 +462,9 @@
     type: bool
   secondaryConcentratorNetworkId:
     description: The secondary concentrator to use when the ipAssignmentMode is 'VPN'.
-      If configured, the APs will switch to using this concentrator if the primary concentrator
-      is unreachable. This param is optional. ('disabled' represents no secondary concentrator.).
+      If configured, the APs will switch to using this concentrator if the primary
+      concentrator is unreachable. This param is optional. ('disabled' represents
+      no secondary concentrator.).
     type: str
   speedBurst:
     description: The SpeedBurst setting for this SSID'.
@@ -482,20 +488,21 @@
       Apps domain'). This attribute is not supported for template children.
     type: str
   useVlanTagging:
-    description: Whether or not traffic should be directed to use specific VLANs. This
-      param is only valid if the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'.
+    description: Whether or not traffic should be directed to use specific VLANs.
+      This param is only valid if the ipAssignmentMode is 'Bridge mode' or 'Layer
+      3 roaming'.
     type: bool
   visible:
     description: Boolean indicating whether APs should advertise or hide this SSID.
       APs will only broadcast this SSID if set to true.
     type: bool
   vlanId:
-    description: The VLAN ID used for VLAN tagging. This param is only valid when the
-      ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'.
+    description: The VLAN ID used for VLAN tagging. This param is only valid when
+      the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'.
     type: int
   walledGardenEnabled:
-    description: Allow access to a configurable list of IP ranges, which users may access
-      prior to sign-on.
+    description: Allow access to a configurable list of IP ranges, which users may
+      access prior to sign-on.
     type: bool
   walledGardenRanges:
     description: Specify your walled garden by entering an array of addresses, ranges
@@ -505,65 +512,61 @@
     elements: str
     type: list
   wpaEncryptionMode:
-    description: The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2 only',
-      'WPA3 Transition Mode', 'WPA3 only' or 'WPA3 192-bit Security').
+    description: The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2
+      only', 'WPA3 Transition Mode', 'WPA3 only' or 'WPA3 192-bit Security').
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsid
-  description: Complete reference of the updateNetworkWirelessSsid API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number},
+  - description: Complete reference of the updateNetworkWirelessSsid API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsid
+short_description: Resource module for networks _wireless _ssids
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.networks_wireless_ssids:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     activeDirectory:
       credentials:
         logonName: user
         password: password
       servers:
-      - host: 127.0.0.1
-        port: 3268
+        - host: 127.0.0.1
+          port: 3268
     adultContentFilteringEnabled: false
     apTagsAndVlanIds:
-    - tags:
-      - tag1
-      - tag2
-      vlanId: 100
+      - tags:
+          - tag1
+          - tag2
+        vlanId: 100
     authMode: 8021x-radius
     availabilityTags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     availableOnAllAps: false
     bandSelection: 5 GHz band only
     concentratorNetworkId: N_24329156
@@ -571,8 +574,8 @@
     disassociateClientsOnVpnFailover: false
     dnsRewrite:
       dnsCustomNameservers:
-      - 8.8.8.8
-      - 8.8.4.4
+        - 8.8.8.8
+        - 8.8.4.4
       enabled: true
     dot11r:
       adaptive: true
@@ -595,63 +598,39 @@
         distinguishedName: cn=user,dc=example,dc=com
         password: password
       serverCaCertificate:
-        contents: '-----BEGIN CERTIFICATE-----
-          MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
-          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT
-          YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
-          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx
-          MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
-          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD
-          aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
-          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn
-          MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
-          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA
-          ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
-          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS
-          KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
-          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU
-          CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
-          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E
-          BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
-          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa
-          jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
-          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/
-          uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
-          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ
-          wTw70BVktzJnb0VLeDg=
+        contents: '-----BEGIN CERTIFICATE----- MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
+          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
+          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
+          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
+          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
+          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
+          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
+          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
+          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
+          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
+          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/ uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
+          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ wTw70BVktzJnb0VLeDg=
           -----END CERTIFICATE-----'
       servers:
-      - host: 127.0.0.1
-        port: 389
+        - host: 127.0.0.1
+          port: 389
     localRadius:
       cacheTimeout: 60
       certificateAuthentication:
         clientRootCaCertificate:
-          contents: '-----BEGIN CERTIFICATE-----
-          MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
-          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT
-          YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
-          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx
-          MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
-          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD
-          aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
-          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn
-          MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
-          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA
-          ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
-          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS
-          KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
-          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU
-          CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
-          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E
-          BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
-          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa
-          jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
-          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/
-          uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
-          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ
-          wTw70BVktzJnb0VLeDg=
-          -----END CERTIFICATE-----'
+          contents: '-----BEGIN CERTIFICATE----- MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
+            gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
+            RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
+            YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
+            MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
+            uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
+            pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
+            aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
+            USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
+            1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
+            a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/ uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
+            UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ wTw70BVktzJnb0VLeDg=
+            -----END CERTIFICATE-----'
         enabled: true
         ocspResponderUrl: http://ocsp-server.example.com
         useLdap: false
@@ -668,17 +647,17 @@
           name: Guest VLAN
       tagging:
         byApTags:
-        - tags:
-          - tag1
-          - tag2
-          vlanName: My VLAN
+          - tags:
+              - tag1
+              - tag2
+            vlanName: My VLAN
         defaultVlanName: My VLAN
         enabled: true
     networkId: string
     number: string
     oauth:
       allowedDomains:
-      - example.com
+        - example.com
     perClientBandwidthLimitDown: 0
     perClientBandwidthLimitUp: 0
     perSsidBandwidthLimitDown: 0
@@ -687,35 +666,23 @@
     radiusAccountingEnabled: true
     radiusAccountingInterimInterval: 5
     radiusAccountingServers:
-    - caCertificate: '-----BEGIN CERTIFICATE-----
-          MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
-          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT
-          YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
-          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx
-          MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
-          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD
-          aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
-          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn
-          MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
-          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA
-          ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
-          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS
-          KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
-          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU
-          CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
-          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E
-          BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
-          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa
-          jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
-          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/
-          uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
-          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ
-          wTw70BVktzJnb0VLeDg=
+      - caCertificate: '-----BEGIN CERTIFICATE----- MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
+          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
+          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
+          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
+          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
+          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
+          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
+          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
+          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
+          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
+          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/ uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
+          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ wTw70BVktzJnb0VLeDg=
           -----END CERTIFICATE-----'
-      host: 0.0.0.0
-      port: 3000
-      radsecEnabled: true
-      secret: secret-string
+        host: 0.0.0.0
+        port: 3000
+        radsecEnabled: true
+        secret: secret-string
     radiusAttributeForGroupPolicies: Filter-Id
     radiusAuthenticationNasId: 00-11-22-33-44-55:AP1
     radiusCalledStationId: 00-11-22-33-44-55:AP1
@@ -730,52 +697,39 @@
     radiusServerAttemptsLimit: 5
     radiusServerTimeout: 5
     radiusServers:
-    - caCertificate: '-----BEGIN CERTIFICATE-----
-          MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
-          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT
-          YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
-          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx
-          MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
-          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD
-          aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
-          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn
-          MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
-          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA
-          ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
-          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS
-          KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
-          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU
-          CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
-          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E
-          BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
-          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa
-          jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
-          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/
-          uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
-          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ
-          wTw70BVktzJnb0VLeDg=
+      - caCertificate: '-----BEGIN CERTIFICATE----- MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
+          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
+          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
+          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
+          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
+          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
+          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM
+          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
+          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
+          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
+          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/ uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
+          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ wTw70BVktzJnb0VLeDg=
           -----END CERTIFICATE-----'
-      host: 0.0.0.0
-      openRoamingCertificateId: 2
-      port: 3000
-      radsecEnabled: true
-      secret: secret-string
+        host: 0.0.0.0
+        openRoamingCertificateId: 2
+        port: 3000
+        radsecEnabled: true
+        secret: secret-string
     radiusTestingEnabled: true
     secondaryConcentratorNetworkId: disabled
     speedBurst:
       enabled: true
     splashGuestSponsorDomains:
-    - example.com
+      - example.com
     splashPage: Click-through splash page
     useVlanTagging: false
     visible: true
     vlanId: 10
     walledGardenEnabled: true
     walledGardenRanges:
-    - example.com
-    - 1.1.1.1/32
+      - example.com
+      - 1.1.1.1/32
     wpaEncryptionMode: WPA2 only
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_bonjour_forwarding.py b/plugins/modules/networks_wireless_ssids_bonjour_forwarding.py
index 315e03aa6..def6ea98c 100644
--- a/plugins/modules/networks_wireless_ssids_bonjour_forwarding.py
+++ b/plugins/modules/networks_wireless_ssids_bonjour_forwarding.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_bonjour_forwarding
-short_description: Resource module for networks _wireless _ssids _bonjour _forwarding
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _bonjour _forwarding.
-- Update the bonjour forwarding setting and rules for the SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _bonjour _forwarding.
+  - Update the bonjour forwarding setting and rules for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_bonjour_forwarding
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_bonjour_forwarding,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/bonjourForwarding,
 options:
   enabled:
     description: If true, Bonjour forwarding is enabled on this SSID.
@@ -53,43 +53,40 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidBonjourForwarding
-  description: Complete reference of the updateNetworkWirelessSsidBonjourForwarding API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-bonjour-forwarding
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_bonjour_forwarding,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/bonjourForwarding,
+  - description: Complete reference of the updateNetworkWirelessSsidBonjourForwarding
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-bonjour-forwarding
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidBonjourForwarding
+short_description: Resource module for networks _wireless _ssids _bonjour _forwarding
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_bonjour_forwarding:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     exception:
@@ -97,11 +94,10 @@
     networkId: string
     number: string
     rules:
-    - description: A simple bonjour rule
-      services:
-      - All Services
-      vlanId: '1'
-
+      - description: A simple bonjour rule
+        services:
+          - All Services
+        vlanId: '1'
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_bonjour_forwarding_info.py b/plugins/modules/networks_wireless_ssids_bonjour_forwarding_info.py
index e5be57b72..77fd7d5a9 100644
--- a/plugins/modules/networks_wireless_ssids_bonjour_forwarding_info.py
+++ b/plugins/modules/networks_wireless_ssids_bonjour_forwarding_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_bonjour_forwarding_info
-short_description: Information module for networks _wireless _ssids _bonjour _forwarding
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _bonjour _forwarding.
-- List the Bonjour forwarding setting and rules for the SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _bonjour _forwarding.
+  - List the Bonjour forwarding setting and rules for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_bonjour_forwarding_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_bonjour_forwarding,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/bonjourForwarding,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidBonjourForwarding
-  description: Complete reference of the getNetworkWirelessSsidBonjourForwarding API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-bonjour-forwarding
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_bonjour_forwarding,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/bonjourForwarding,
+  - description: Complete reference of the getNetworkWirelessSsidBonjourForwarding
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-bonjour-forwarding
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidBonjourForwarding
+short_description: Information module for networks _wireless _ssids _bonjour _forwarding
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _bonjour _forwarding
   cisco.meraki.networks_wireless_ssids_bonjour_forwarding_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_device_type_group_policies.py b/plugins/modules/networks_wireless_ssids_device_type_group_policies.py
index 20e485282..a7a107fdc 100644
--- a/plugins/modules/networks_wireless_ssids_device_type_group_policies.py
+++ b/plugins/modules/networks_wireless_ssids_device_type_group_policies.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_device_type_group_policies
-short_description: Resource module for networks _wireless _ssids _device _type _group _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _device _type _group _policies.
-- Update the device type group policies for the SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _device _type
+    _group _policies.
+  - Update the device type group policies for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_device_type_group_policies
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_device_type_group_policies,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/deviceTypeGroupPolicies,
 options:
   deviceTypePolicies:
     description: List of device type policies.
@@ -43,54 +44,51 @@
     description: Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidDeviceTypeGroupPolicies
-  description: Complete reference of the updateNetworkWirelessSsidDeviceTypeGroupPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-device-type-group-policies
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_device_type_group_policies,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/deviceTypeGroupPolicies,
+  - description: Complete reference of the updateNetworkWirelessSsidDeviceTypeGroupPolicies
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-device-type-group-policies
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidDeviceTypeGroupPolicies
+short_description: Resource module for networks _wireless _ssids _device _type _group
+  _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_device_type_group_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     deviceTypePolicies:
-    - devicePolicy: Allowed
-      deviceType: Android
-    - devicePolicy: Group policy
-      deviceType: iPhone
-      groupPolicyId: 101
+      - devicePolicy: Allowed
+        deviceType: Android
+      - devicePolicy: Group policy
+        deviceType: iPhone
+        groupPolicyId: 101
     enabled: true
     networkId: string
     number: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_device_type_group_policies_info.py b/plugins/modules/networks_wireless_ssids_device_type_group_policies_info.py
index 7306ee370..b5b62df73 100644
--- a/plugins/modules/networks_wireless_ssids_device_type_group_policies_info.py
+++ b/plugins/modules/networks_wireless_ssids_device_type_group_policies_info.py
@@ -5,70 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_device_type_group_policies_info
-short_description: Information module for networks _wireless _ssids _device _type _group _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _device _type _group _policies.
-- List the device type group policies for the SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _device _type _group _policies.
+  - List the device type group policies for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_device_type_group_policies_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_device_type_group_policies,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/deviceTypeGroupPolicies,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidDeviceTypeGroupPolicies
-  description: Complete reference of the getNetworkWirelessSsidDeviceTypeGroupPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-device-type-group-policies
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_device_type_group_policies,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/deviceTypeGroupPolicies,
+  - description: Complete reference of the getNetworkWirelessSsidDeviceTypeGroupPolicies
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-device-type-group-policies
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidDeviceTypeGroupPolicies
+short_description: Information module for networks _wireless _ssids _device _type
+  _group _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _device _type _group _policies
   cisco.meraki.networks_wireless_ssids_device_type_group_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_eap_override.py b/plugins/modules/networks_wireless_ssids_eap_override.py
index 67b1187e2..f161e8b30 100644
--- a/plugins/modules/networks_wireless_ssids_eap_override.py
+++ b/plugins/modules/networks_wireless_ssids_eap_override.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_eap_override
-short_description: Resource module for networks _wireless _ssids _eap _override
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _eap _override.
-- Update the EAP overridden parameters for an SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _eap _override.
+  - Update the EAP overridden parameters for an SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_eap_override
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_eap_override,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/eapOverride,
 options:
   eapolKey:
     description: EAPOL Key settings.
@@ -49,43 +49,39 @@
     description: General EAP timeout in seconds.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidEapOverride
-  description: Complete reference of the updateNetworkWirelessSsidEapOverride API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-eap-override
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_eap_override,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/eapOverride,
+  - description: Complete reference of the updateNetworkWirelessSsidEapOverride API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-eap-override
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidEapOverride
+short_description: Resource module for networks _wireless _ssids _eap _override
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_eap_override:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     eapolKey:
       retries: 5
@@ -97,7 +93,6 @@
     networkId: string
     number: string
     timeout: 5
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_eap_override_info.py b/plugins/modules/networks_wireless_ssids_eap_override_info.py
index dcc7ab6a1..fcc86ce0d 100644
--- a/plugins/modules/networks_wireless_ssids_eap_override_info.py
+++ b/plugins/modules/networks_wireless_ssids_eap_override_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_eap_override_info
-short_description: Information module for networks _wireless _ssids _eap _override
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _eap _override.
-- Return the EAP overridden parameters for an SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _eap _override.
+  - Return the EAP overridden parameters for an SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_eap_override_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_eap_override,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/eapOverride,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidEapOverride
-  description: Complete reference of the getNetworkWirelessSsidEapOverride API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-eap-override
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_eap_override,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/eapOverride,
+  - description: Complete reference of the getNetworkWirelessSsidEapOverride API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-eap-override
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidEapOverride
+short_description: Information module for networks _wireless _ssids _eap _override
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _eap _override
   cisco.meraki.networks_wireless_ssids_eap_override_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules.py b/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules.py
index 688f2554a..693e8c11f 100644
--- a/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules.py
+++ b/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_firewall_l3_firewall_rules
-short_description: Resource module for networks _wireless _ssids _firewall l3 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _firewall l3 _firewall _rules.
-- Update the L3 firewall rules of an SSID on an MR network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _firewall l3
+    _firewall _rules.
+  - Update the L3 firewall rules of an SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_firewall_l3_firewall_rules
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_firewall_l3_firewall_rules,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/firewall/l3FirewallRules,
 options:
   allowLanAccess:
     description: Allow wireless client access to local LAN (boolean value - true allows
@@ -35,8 +36,8 @@
         description: Description of the rule (optional).
         type: str
       destCidr:
-        description: Comma-separated list of destination IP address(es) (in IP or CIDR
-          notation), fully-qualified domain names (FQDN) or 'any'.
+        description: Comma-separated list of destination IP address(es) (in IP or
+          CIDR notation), fully-qualified domain names (FQDN) or 'any'.
         type: str
       destPort:
         description: Comma-separated list of destination port(s) (integer in the range
@@ -51,54 +52,51 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidFirewallL3FirewallRules
-  description: Complete reference of the updateNetworkWirelessSsidFirewallL3FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-firewall-l3-firewall-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_firewall_l3_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/firewall/l3FirewallRules,
+  - description: Complete reference of the updateNetworkWirelessSsidFirewallL3FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-firewall-l3-firewall-rules
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidFirewallL3FirewallRules
+short_description: Resource module for networks _wireless _ssids _firewall l3 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_firewall_l3_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     allowLanAccess: true
     networkId: string
     number: string
     rules:
-    - comment: Allow TCP traffic to subnet with HTTP servers.
-      destCidr: 192.168.1.0/24
-      destPort: '443'
-      policy: allow
-      protocol: tcp
-
+      - comment: Allow TCP traffic to subnet with HTTP servers.
+        destCidr: 192.168.1.0/24
+        destPort: '443'
+        policy: allow
+        protocol: tcp
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules_info.py b/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules_info.py
index caf2c2034..36d9ff015 100644
--- a/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules_info.py
+++ b/plugins/modules/networks_wireless_ssids_firewall_l3_firewall_rules_info.py
@@ -5,70 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_firewall_l3_firewall_rules_info
-short_description: Information module for networks _wireless _ssids _firewall l3 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _firewall l3 _firewall _rules.
-- Return the L3 firewall rules for an SSID on an MR network.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _firewall l3 _firewall _rules.
+  - Return the L3 firewall rules for an SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_firewall_l3_firewall_rules_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_firewall_l3_firewall_rules,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/firewall/l3FirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidFirewallL3FirewallRules
-  description: Complete reference of the getNetworkWirelessSsidFirewallL3FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-firewall-l3-firewall-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_firewall_l3_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/firewall/l3FirewallRules,
+  - description: Complete reference of the getNetworkWirelessSsidFirewallL3FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-firewall-l3-firewall-rules
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidFirewallL3FirewallRules
+short_description: Information module for networks _wireless _ssids _firewall l3 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _firewall l3 _firewall _rules
   cisco.meraki.networks_wireless_ssids_firewall_l3_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules.py b/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules.py
index 67d8b0a3d..25e3daf49 100644
--- a/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules.py
+++ b/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_firewall_l7_firewall_rules
-short_description: Resource module for networks _wireless _ssids _firewall l7 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _firewall l7 _firewall _rules.
-- Update the L7 firewall rules of an SSID on an MR network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _firewall l7
+    _firewall _rules.
+  - Update the L7 firewall rules of an SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_firewall_l7_firewall_rules
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_firewall_l7_firewall_rules,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/firewall/l7FirewallRules,
 options:
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -24,8 +25,8 @@
     type: str
   rules:
     description: An array of L7 firewall rules for this SSID. Rules will get applied
-      in the same order user has specified in request. Empty array will clear the L7
-      firewall rule configuration.
+      in the same order user has specified in request. Empty array will clear the
+      L7 firewall rule configuration.
     elements: dict
     suboptions:
       policy:
@@ -41,51 +42,48 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidFirewallL7FirewallRules
-  description: Complete reference of the updateNetworkWirelessSsidFirewallL7FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-firewall-l7-firewall-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_firewall_l7_firewall_rules,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/firewall/l7FirewallRules,
+  - description: Complete reference of the updateNetworkWirelessSsidFirewallL7FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-firewall-l7-firewall-rules
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidFirewallL7FirewallRules
+short_description: Resource module for networks _wireless _ssids _firewall l7 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_firewall_l7_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networkId: string
     number: string
     rules:
-    - policy: deny
-      type: host
-      value: google.com
-
+      - policy: deny
+        type: host
+        value: google.com
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules_info.py b/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules_info.py
index ac4d7d1f3..c1bea2c7f 100644
--- a/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules_info.py
+++ b/plugins/modules/networks_wireless_ssids_firewall_l7_firewall_rules_info.py
@@ -5,70 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_firewall_l7_firewall_rules_info
-short_description: Information module for networks _wireless _ssids _firewall l7 _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _firewall l7 _firewall _rules.
-- Return the L7 firewall rules for an SSID on an MR network.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _firewall l7 _firewall _rules.
+  - Return the L7 firewall rules for an SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_firewall_l7_firewall_rules_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_firewall_l7_firewall_rules,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/firewall/l7FirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidFirewallL7FirewallRules
-  description: Complete reference of the getNetworkWirelessSsidFirewallL7FirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-firewall-l7-firewall-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_firewall_l7_firewall_rules,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/firewall/l7FirewallRules,
+  - description: Complete reference of the getNetworkWirelessSsidFirewallL7FirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-firewall-l7-firewall-rules
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidFirewallL7FirewallRules
+short_description: Information module for networks _wireless _ssids _firewall l7 _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _firewall l7 _firewall _rules
   cisco.meraki.networks_wireless_ssids_firewall_l7_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_hotspot20.py b/plugins/modules/networks_wireless_ssids_hotspot20.py
index d2ec55970..1735cf233 100644
--- a/plugins/modules/networks_wireless_ssids_hotspot20.py
+++ b/plugins/modules/networks_wireless_ssids_hotspot20.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_hotspot20
-short_description: Resource module for networks _wireless _ssids _hotspot20
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _hotspot20.
-- Update the Hotspot 2.0 settings of an SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _hotspot20.
+  - Update the Hotspot 2.0 settings of an SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_hotspot20
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_hotspot20,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/hotspot20,
 options:
   domains:
     description: An array of domain names.
@@ -46,15 +46,15 @@
         elements: dict
         suboptions:
           authenticationTypes:
-            description: The authentication types for the method. These should be formatted
-              as an object with the EAP method category in camelcase as the key and
-              the list of types as the value (nonEapInnerAuthentication Reserved, PAP,
-              CHAP, MSCHAP, MSCHAPV2; eapInnerAuthentication EAP-TLS, EAP-SIM, EAP-AKA,
-              EAP-TTLS with MSCHAPv2; credentials SIM, USIM, NFC Secure Element, Hardware
-              Token, Softoken, Certificate, username/password, none, Reserved, Vendor
-              Specific; tunneledEapMethodCredentials SIM, USIM, NFC Secure Element,
-              Hardware Token, Softoken, Certificate, username/password, Reserved, Anonymous,
-              Vendor Specific).
+            description: The authentication types for the method. These should be
+              formatted as an object with the EAP method category in camelcase as
+              the key and the list of types as the value (nonEapInnerAuthentication
+              Reserved, PAP, CHAP, MSCHAP, MSCHAPV2; eapInnerAuthentication EAP-TLS,
+              EAP-SIM, EAP-AKA, EAP-TTLS with MSCHAPv2; credentials SIM, USIM, NFC
+              Secure Element, Hardware Token, Softoken, Certificate, username/password,
+              none, Reserved, Vendor Specific; tunneledEapMethodCredentials SIM, USIM,
+              NFC Secure Element, Hardware Token, Softoken, Certificate, username/password,
+              Reserved, Anonymous, Vendor Specific).
             type: dict
           id:
             description: ID of method.
@@ -67,7 +67,8 @@
   networkAccessType:
     description: The network type of this SSID ('Private network', 'Private network
       with guest access', 'Chargeable public network', 'Free public network', 'Personal
-      device network', 'Emergency services only network', 'Test or experimental', 'Wildcard').
+      device network', 'Emergency services only network', 'Test or experimental',
+      'Wildcard').
     type: str
   networkId:
     description: NetworkId path parameter. Network ID.
@@ -83,8 +84,8 @@
         type: str
     type: dict
   roamConsortOis:
-    description: An array of roaming consortium OIs (hexadecimal number 3-5 octets in
-      length).
+    description: An array of roaming consortium OIs (hexadecimal number 3-5 octets
+      in length).
     elements: str
     type: list
   venue:
@@ -104,9 +105,9 @@
           Secondary', 'University or College', 'Unspecified Factory and Industrial',
           'Factory', 'Unspecified Institutional', 'Hospital', 'Long-Term Care Facility',
           'Alcohol and Drug Rehabilitation Center', 'Group Home', 'Prison or Jail',
-          'Unspecified Mercantile', 'Retail Store', 'Grocery Market', 'Automotive Service
-          Station', 'Shopping Mall', 'Gas Station', 'Unspecified Residential', 'Private
-          Residence', 'Hotel or Motel', 'Dormitory', 'Boarding House', 'Unspecified
+          'Unspecified Mercantile', 'Retail Store', 'Grocery Market', 'Automotive
+          Service Station', 'Shopping Mall', 'Gas Station', 'Unspecified Residential',
+          'Private Residence', 'Hotel or Motel', 'Dormitory', 'Boarding House', 'Unspecified
           Storage', 'Unspecified Utility and Miscellaneous', 'Unspecified Vehicular',
           'Automobile or Truck', 'Airplane', 'Bus', 'Ferry', 'Ship or Boat', 'Train',
           'Motor Bike', 'Unspecified Outdoor', 'Muni-mesh Network', 'City Park', 'Rest
@@ -114,77 +115,72 @@
         type: str
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidHotspot20
-  description: Complete reference of the updateNetworkWirelessSsidHotspot20 API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-hotspot20
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_hotspot20,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/hotspot20,
+  - description: Complete reference of the updateNetworkWirelessSsidHotspot20 API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-hotspot20
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidHotspot20
+short_description: Resource module for networks _wireless _ssids _hotspot20
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_hotspot20:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     domains:
-    - meraki.local
-    - domain2.com
+      - meraki.local
+      - domain2.com
     enabled: true
     mccMncs:
-    - mcc: '123'
-      mnc: '456'
-    - mcc: '563'
-      mnc: '232'
+      - mcc: '123'
+        mnc: '456'
+      - mcc: '563'
+        mnc: '232'
     naiRealms:
-    - format: '1'
-      methods:
-      - authenticationTypes:
-          credentials: []
-          eapInnerAuthentication:
-          - EAP-TTLS with MSCHAPv2
-          nonEapInnerAuthentication:
-          - MSCHAP
-          tunneledEapMethodCredentials: []
-        id: '1'
-      name: Realm 1
+      - format: '1'
+        methods:
+          - authenticationTypes:
+              credentials: []
+              eapInnerAuthentication:
+                - EAP-TTLS with MSCHAPv2
+              nonEapInnerAuthentication:
+                - MSCHAP
+              tunneledEapMethodCredentials: []
+            id: '1'
+        name: Realm 1
     networkAccessType: Private network
     networkId: string
     number: string
     operator:
       name: Meraki Product Management
     roamConsortOis:
-    - ABC123
-    - 456EFG
+      - ABC123
+      - 456EFG
     venue:
       name: SF Branch
       type: Unspecified Assembly
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_hotspot20_info.py b/plugins/modules/networks_wireless_ssids_hotspot20_info.py
index 1586e3580..a7e3c6811 100644
--- a/plugins/modules/networks_wireless_ssids_hotspot20_info.py
+++ b/plugins/modules/networks_wireless_ssids_hotspot20_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_hotspot20_info
-short_description: Information module for networks _wireless _ssids _hotspot20
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _hotspot20.
-- Return the Hotspot 2.0 settings for an SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _hotspot20.
+  - Return the Hotspot 2.0 settings for an SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_hotspot20_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_hotspot20,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/hotspot20,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidHotspot20
-  description: Complete reference of the getNetworkWirelessSsidHotspot20 API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-hotspot20
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_hotspot20,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/hotspot20,
+  - description: Complete reference of the getNetworkWirelessSsidHotspot20 API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-hotspot20
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidHotspot20
+short_description: Information module for networks _wireless _ssids _hotspot20
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _hotspot20
   cisco.meraki.networks_wireless_ssids_hotspot20_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_identity_psks.py b/plugins/modules/networks_wireless_ssids_identity_psks.py
index c8b28033e..a1accbb6e 100644
--- a/plugins/modules/networks_wireless_ssids_identity_psks.py
+++ b/plugins/modules/networks_wireless_ssids_identity_psks.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_identity_psks
-short_description: Resource module for networks _wireless _ssids _identity _psks
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource networks _wireless _ssids _identity _psks.
-- Create an Identity PSK.
-- Delete an Identity PSK.
-- Update an Identity PSK.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource networks _wireless
+    _ssids _identity _psks.
+  - Create an Identity PSK.
+  - Delete an Identity PSK.
+  - Update an Identity PSK.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_identity_psks
+notes:
+  - SDK Method used are wireless.Wireless.create_network_wireless_ssid_identity_psk,
+    wireless.Wireless.delete_network_wireless_ssid_identity_psk, wireless.Wireless.update_network_wireless_ssid_identity_psk,
+  - Paths used are post /networks/{networkId}/wireless/ssids/{number}/identityPsks,
+    delete /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
+    put /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
 options:
   expiresAt:
     description: Timestamp for when the Identity PSK expires. Will not expire if left
@@ -38,57 +42,49 @@
     description: Number path parameter.
     type: str
   passphrase:
-    description: The passphrase for client authentication. If left blank, one will be
-      auto-generated.
+    description: The passphrase for client authentication. If left blank, one will
+      be auto-generated.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless createNetworkWirelessSsidIdentityPsk
-  description: Complete reference of the createNetworkWirelessSsidIdentityPsk API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-ssid-identity-psk
-- name: Cisco Meraki documentation for wireless deleteNetworkWirelessSsidIdentityPsk
-  description: Complete reference of the deleteNetworkWirelessSsidIdentityPsk API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-ssid-identity-psk
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidIdentityPsk
-  description: Complete reference of the updateNetworkWirelessSsidIdentityPsk API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-identity-psk
-notes:
-  - SDK Method used are
-    wireless.Wireless.create_network_wireless_ssid_identity_psk,
-    wireless.Wireless.delete_network_wireless_ssid_identity_psk,
-    wireless.Wireless.update_network_wireless_ssid_identity_psk,
-
-  - Paths used are
-    post /networks/{networkId}/wireless/ssids/{number}/identityPsks,
-    delete /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
-    put /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
+  - description: Complete reference of the createNetworkWirelessSsidIdentityPsk API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-network-wireless-ssid-identity-psk
+    name: Cisco Meraki documentation for wireless createNetworkWirelessSsidIdentityPsk
+  - description: Complete reference of the deleteNetworkWirelessSsidIdentityPsk API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-network-wireless-ssid-identity-psk
+    name: Cisco Meraki documentation for wireless deleteNetworkWirelessSsidIdentityPsk
+  - description: Complete reference of the updateNetworkWirelessSsidIdentityPsk API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-identity-psk
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidIdentityPsk
+short_description: Resource module for networks _wireless _ssids _identity _psks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.networks_wireless_ssids_identity_psks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     expiresAt: '2018-02-11T00:00:00.090210Z'
     groupPolicyId: '101'
@@ -96,56 +92,54 @@
     networkId: string
     number: string
     passphrase: secret
-
 - name: Delete by id
   cisco.meraki.networks_wireless_ssids_identity_psks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     identityPskId: string
     networkId: string
     number: string
-
 - name: Update by id
   cisco.meraki.networks_wireless_ssids_identity_psks:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     expiresAt: '2018-02-11T00:00:00.090210Z'
     groupPolicyId: '101'
@@ -154,7 +148,6 @@
     networkId: string
     number: string
     passphrase: secret
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_identity_psks_info.py b/plugins/modules/networks_wireless_ssids_identity_psks_info.py
index 4595593dc..cd9ffafd1 100644
--- a/plugins/modules/networks_wireless_ssids_identity_psks_info.py
+++ b/plugins/modules/networks_wireless_ssids_identity_psks_info.py
@@ -5,108 +5,102 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_identity_psks_info
-short_description: Information module for networks _wireless _ssids _identity _psks
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _identity _psks.
-- Get networks _wireless _ssids _identity _psks by id.
-- List all Identity PSKs in a wireless network.
-- Return an Identity PSK.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _identity _psks.
+  - Get networks _wireless _ssids _identity _psks by id.
+  - List all Identity PSKs in a wireless network.
+  - Return an Identity PSK.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_identity_psks_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_identity_psk,
+    wireless.Wireless.get_network_wireless_ssid_identity_psks,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/identityPsks,
+    get /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  networkId:
+  identityPskId:
     description:
-    - NetworkId path parameter. Network ID.
+      - IdentityPskId path parameter. Identity psk ID.
     type: str
-  number:
+  networkId:
     description:
-    - Number path parameter.
+      - NetworkId path parameter. Network ID.
     type: str
-  identityPskId:
+  number:
     description:
-    - IdentityPskId path parameter. Identity psk ID.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidIdentityPsk
-  description: Complete reference of the getNetworkWirelessSsidIdentityPsk API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-identity-psk
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidIdentityPsks
-  description: Complete reference of the getNetworkWirelessSsidIdentityPsks API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-identity-psks
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_identity_psk,
-    wireless.Wireless.get_network_wireless_ssid_identity_psks,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/identityPsks,
-    get /networks/{networkId}/wireless/ssids/{number}/identityPsks/{identityPskId},
+  - description: Complete reference of the getNetworkWirelessSsidIdentityPsk API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-identity-psk
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidIdentityPsk
+  - description: Complete reference of the getNetworkWirelessSsidIdentityPsks API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-identity-psks
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidIdentityPsks
+short_description: Information module for networks _wireless _ssids _identity _psks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _identity _psks
   cisco.meraki.networks_wireless_ssids_identity_psks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 - name: Get networks _wireless _ssids _identity _psks by id
   cisco.meraki.networks_wireless_ssids_identity_psks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
     identityPskId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_info.py b/plugins/modules/networks_wireless_ssids_info.py
index 9f3fa4dbf..cdc8b617f 100644
--- a/plugins/modules/networks_wireless_ssids_info.py
+++ b/plugins/modules/networks_wireless_ssids_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_info
-short_description: Information module for networks _wireless _ssids
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids.
-- Get networks _wireless _ssids by id.
-- List the MR SSIDs in a network.
-- Return a single MR SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids.
+  - Get networks _wireless _ssids by id.
+  - List the MR SSIDs in a network.
+  - Return a single MR SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid, wireless.Wireless.get_network_wireless_ssids,
+  - Paths used are get /networks/{networkId}/wireless/ssids, get /networks/{networkId}/wireless/ssids/{number},
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsid
-  description: Complete reference of the getNetworkWirelessSsid API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsids
-  description: Complete reference of the getNetworkWirelessSsids API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssids
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid,
-    wireless.Wireless.get_network_wireless_ssids,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids,
-    get /networks/{networkId}/wireless/ssids/{number},
+  - description: Complete reference of the getNetworkWirelessSsid API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsid
+  - description: Complete reference of the getNetworkWirelessSsids API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssids
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsids
+short_description: Information module for networks _wireless _ssids
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids
   cisco.meraki.networks_wireless_ssids_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
   register: result
-
 - name: Get networks _wireless _ssids by id
   cisco.meraki.networks_wireless_ssids_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_schedules.py b/plugins/modules/networks_wireless_ssids_schedules.py
index 73c527687..2f8ee5600 100644
--- a/plugins/modules/networks_wireless_ssids_schedules.py
+++ b/plugins/modules/networks_wireless_ssids_schedules.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_schedules
-short_description: Resource module for networks _wireless _ssids _schedules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _schedules.
-- Update the outage schedule for the SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _schedules.
+  - Update the outage schedule for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_schedules
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_schedules,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/schedules,
 options:
   enabled:
     description: If true, the SSID outage schedule is enabled.
@@ -32,8 +32,8 @@
     elements: dict
     suboptions:
       endDay:
-        description: Day of when the outage ends. Can be either full day name, or three
-          letter abbreviation.
+        description: Day of when the outage ends. Can be either full day name, or
+          three letter abbreviation.
         type: str
       endTime:
         description: 24 hour time when the outage ends.
@@ -47,9 +47,9 @@
         type: str
     type: list
   rangesInSeconds:
-    description: List of outage ranges in seconds since Sunday at Midnight. Has a start
-      and end. If this parameter is passed in along with the ranges parameter, ranges
-      will take precedence.
+    description: List of outage ranges in seconds since Sunday at Midnight. Has a
+      start and end. If this parameter is passed in along with the ranges parameter,
+      ranges will take precedence.
     elements: dict
     suboptions:
       end:
@@ -60,56 +60,51 @@
         type: int
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidSchedules
-  description: Complete reference of the updateNetworkWirelessSsidSchedules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-schedules
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_schedules,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/schedules,
+  - description: Complete reference of the updateNetworkWirelessSsidSchedules API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-schedules
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidSchedules
+short_description: Resource module for networks _wireless _ssids _schedules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_schedules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     networkId: string
     number: string
     ranges:
-    - endDay: Tuesday
-      endTime: 05:00
-      startDay: Tuesday
-      startTime: 01:00
+      - endDay: Tuesday
+        endTime: 05:00
+        startDay: Tuesday
+        startTime: 01:00
     rangesInSeconds:
-    - end: 0
-      start: 604800
-
+      - end: 0
+        start: 604800
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_schedules_info.py b/plugins/modules/networks_wireless_ssids_schedules_info.py
index 940496170..d35caa5e5 100644
--- a/plugins/modules/networks_wireless_ssids_schedules_info.py
+++ b/plugins/modules/networks_wireless_ssids_schedules_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_schedules_info
-short_description: Information module for networks _wireless _ssids _schedules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _schedules.
-- List the outage schedule for the SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _schedules.
+  - List the outage schedule for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_schedules_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_schedules,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/schedules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidSchedules
-  description: Complete reference of the getNetworkWirelessSsidSchedules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-schedules
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_schedules,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/schedules,
+  - description: Complete reference of the getNetworkWirelessSsidSchedules API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-schedules
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidSchedules
+short_description: Information module for networks _wireless _ssids _schedules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _schedules
   cisco.meraki.networks_wireless_ssids_schedules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_splash_settings.py b/plugins/modules/networks_wireless_ssids_splash_settings.py
index 0f3807fb1..66aada994 100644
--- a/plugins/modules/networks_wireless_ssids_splash_settings.py
+++ b/plugins/modules/networks_wireless_ssids_splash_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_splash_settings
-short_description: Resource module for networks _wireless _ssids _splash _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _splash _settings.
-- Modify the splash page settings for the given SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _splash _settings.
+  - Modify the splash page settings for the given SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_splash_settings
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_splash_settings,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/splash/settings,
 options:
   allowSimultaneousLogins:
     description: Whether or not to allow simultaneous logins from different devices.
@@ -52,8 +52,8 @@
     description: Details associated with guest sponsored splash.
     suboptions:
       durationInMinutes:
-        description: Duration in minutes of sponsored guest authorization. Must be between
-          1 and 60480 (6 weeks).
+        description: Duration in minutes of sponsored guest authorization. Must be
+          between 1 and 60480 (6 weeks).
         type: int
       guestCanRequestTimeframe:
         description: Whether or not guests can specify how much time they are requesting.
@@ -66,7 +66,8 @@
     description: Number path parameter.
     type: str
   redirectUrl:
-    description: The custom redirect URL where the users will go after the splash page.
+    description: The custom redirect URL where the users will go after the splash
+      page.
     type: str
   sentryEnrollment:
     description: Systems Manager sentry enrollment splash settings.
@@ -98,11 +99,12 @@
         description: Properties for setting a new image.
         suboptions:
           contents:
-            description: The file contents (a base 64 encoded string) of your new image.
+            description: The file contents (a base 64 encoded string) of your new
+              image.
             type: str
           format:
-            description: The format of the encoded contents. Supported formats are 'png',
-              'gif', and jpg'.
+            description: The format of the encoded contents. Supported formats are
+              'png', 'gif', and jpg'.
             type: str
         type: dict
       md5:
@@ -120,11 +122,12 @@
         description: Properties for setting a new image.
         suboptions:
           contents:
-            description: The file contents (a base 64 encoded string) of your new logo.
+            description: The file contents (a base 64 encoded string) of your new
+              logo.
             type: str
           format:
-            description: The format of the encoded contents. Supported formats are 'png',
-              'gif', and jpg'.
+            description: The format of the encoded contents. Supported formats are
+              'png', 'gif', and jpg'.
             type: str
         type: dict
       md5:
@@ -142,12 +145,12 @@
         description: Properties for setting a new image.
         suboptions:
           contents:
-            description: The file contents (a base 64 encoded string) of your new prepaid
-              front.
+            description: The file contents (a base 64 encoded string) of your new
+              prepaid front.
             type: str
           format:
-            description: The format of the encoded contents. Supported formats are 'png',
-              'gif', and jpg'.
+            description: The format of the encoded contents. Supported formats are
+              'png', 'gif', and jpg'.
             type: str
         type: dict
       md5:
@@ -160,65 +163,62 @@
       see the splash page.
     type: int
   splashUrl:
-    description: Optional The custom splash URL of the click-through splash page. Note
-      that the URL can be configured without necessarily being used. In order to enable
-      the custom URL, see 'useSplashUrl'.
+    description: Optional The custom splash URL of the click-through splash page.
+      Note that the URL can be configured without necessarily being used. In order
+      to enable the custom URL, see 'useSplashUrl'.
     type: str
   themeId:
     description: The id of the selected splash theme.
     type: str
   useRedirectUrl:
-    description: The Boolean indicating whether the the user will be redirected to the
-      custom redirect URL after the splash page. A custom redirect URL must be set if
-      this is true.
+    description: The Boolean indicating whether the the user will be redirected to
+      the custom redirect URL after the splash page. A custom redirect URL must be
+      set if this is true.
     type: bool
   useSplashUrl:
-    description: Optional Boolean indicating whether the users will be redirected to
-      the custom splash url. A custom splash URL must be set if this is true. Note that
-      depending on your SSID's access control settings, it may not be possible to use
-      the custom splash URL.
+    description: Optional Boolean indicating whether the users will be redirected
+      to the custom splash url. A custom splash URL must be set if this is true. Note
+      that depending on your SSID's access control settings, it may not be possible
+      to use the custom splash URL.
     type: bool
   welcomeMessage:
     description: The welcome message for the users on the splash page.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidSplashSettings
-  description: Complete reference of the updateNetworkWirelessSsidSplashSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-splash-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_splash_settings,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/splash/settings,
+  - description: Complete reference of the updateNetworkWirelessSsidSplashSettings
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-splash-settings
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidSplashSettings
+short_description: Resource module for networks _wireless _ssids _splash _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_splash_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     allowSimultaneousLogins: false
     billing:
@@ -237,7 +237,7 @@
     redirectUrl: https://example.com
     sentryEnrollment:
       enforcedSystems:
-      - iOS
+        - iOS
       strength: focused
       systemsManagerNetwork:
         id: N_1234
@@ -265,7 +265,6 @@
     useRedirectUrl: true
     useSplashUrl: true
     welcomeMessage: Welcome!
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_splash_settings_info.py b/plugins/modules/networks_wireless_ssids_splash_settings_info.py
index 6a3f33d02..146fe4ae0 100644
--- a/plugins/modules/networks_wireless_ssids_splash_settings_info.py
+++ b/plugins/modules/networks_wireless_ssids_splash_settings_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_splash_settings_info
-short_description: Information module for networks _wireless _ssids _splash _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _splash _settings.
-- Display the splash page settings for the given SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _splash _settings.
+  - Display the splash page settings for the given SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_splash_settings_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_splash_settings,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/splash/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidSplashSettings
-  description: Complete reference of the getNetworkWirelessSsidSplashSettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-splash-settings
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_splash_settings,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/splash/settings,
+  - description: Complete reference of the getNetworkWirelessSsidSplashSettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-splash-settings
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidSplashSettings
+short_description: Information module for networks _wireless _ssids _splash _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _splash _settings
   cisco.meraki.networks_wireless_ssids_splash_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_traffic_shaping_rules.py b/plugins/modules/networks_wireless_ssids_traffic_shaping_rules.py
index e3ed94d55..233419a5b 100644
--- a/plugins/modules/networks_wireless_ssids_traffic_shaping_rules.py
+++ b/plugins/modules/networks_wireless_ssids_traffic_shaping_rules.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_traffic_shaping_rules
-short_description: Resource module for networks _wireless _ssids _traffic _shaping _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _traffic _shaping _rules.
-- Update the traffic shaping rules for an SSID on an MR network.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _traffic _shaping
+    _rules.
+  - Update the traffic shaping rules for an SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_traffic_shaping_rules
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_traffic_shaping_rules,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/trafficShaping/rules,
 options:
   defaultRulesEnabled:
     description: Whether default traffic shaping rules are enabled (true) or disabled
@@ -28,14 +29,14 @@
     description: Number path parameter.
     type: str
   rules:
-    description: An array of traffic shaping rules. Rules are applied in the order that
-      they are specified in. An empty list (or null) means no rules. Note that you are
-      allowed a maximum of 8 rules.
+    description: An array of traffic shaping rules. Rules are applied in the order
+      that they are specified in. An empty list (or null) means no rules. Note that
+      you are allowed a maximum of 8 rules.
     elements: dict
     suboptions:
       definitions:
-        description: A list of objects describing the definitions of your traffic shaping
-          rule. At least one definition is required.
+        description: A list of objects describing the definitions of your traffic
+          shaping rule. At least one definition is required.
         elements: dict
         suboptions:
           type:
@@ -45,30 +46,31 @@
           value:
             description: If "type" is 'host', 'port', 'ipRange' or 'localNet', then
               "value" must be a string, matching either a hostname (e.g. "somesite.com"),
-              a port (e.g. 8080), or an IP range ("192.1.0.0", "192.1.0.0/16", or "10.1.0.0/16
-              80"). 'localNet' also supports CIDR notation, excluding custom ports.
-              If "type" is 'application' or 'applicationCategory', then "value" must
-              be an object with the structure { "id" "meraki layer7/..." }, where "id"
-              is the application category or application ID (for a list of IDs for your
-              network, use the trafficShaping/applicationCategories endpoint).
+              a port (e.g. 8080), or an IP range ("192.1.0.0", "192.1.0.0/16", or
+              "10.1.0.0/16 80"). 'localNet' also supports CIDR notation, excluding
+              custom ports. If "type" is 'application' or 'applicationCategory', then
+              "value" must be an object with the structure { "id" "meraki layer7/..."
+              }, where "id" is the application category or application ID (for a list
+              of IDs for your network, use the trafficShaping/applicationCategories
+              endpoint).
             type: str
         type: list
       dscpTagValue:
-        description: The DSCP tag applied by your rule. Null means 'Do not change DSCP
-          tag'. For a list of possible tag values, use the trafficShaping/dscpTaggingOptions
+        description: The DSCP tag applied by your rule. Null means 'Do not change
+          DSCP tag'. For a list of possible tag values, use the trafficShaping/dscpTaggingOptions
           endpoint.
         type: int
       pcpTagValue:
-        description: The PCP tag applied by your rule. Can be 0 (lowest priority) through
-          7 (highest priority). Null means 'Do not set PCP tag'.
+        description: The PCP tag applied by your rule. Can be 0 (lowest priority)
+          through 7 (highest priority). Null means 'Do not set PCP tag'.
         type: int
       perClientBandwidthLimits:
         description: An object describing the bandwidth settings for your rule.
         suboptions:
           bandwidthLimits:
             description: The bandwidth limits object, specifying the upload ('limitUp')
-              and download ('limitDown') speed in Kbps. These are only enforced if 'settings'
-              is set to 'custom'.
+              and download ('limitDown') speed in Kbps. These are only enforced if
+              'settings' is set to 'custom'.
             suboptions:
               limitDown:
                 description: The maximum download limit (integer, in Kbps).
@@ -78,8 +80,8 @@
                 type: int
             type: dict
           settings:
-            description: How bandwidth limits are applied by your rule. Can be one of
-              'network default', 'ignore' or 'custom'.
+            description: How bandwidth limits are applied by your rule. Can be one
+              of 'network default', 'ignore' or 'custom'.
             type: str
         type: dict
     type: list
@@ -87,60 +89,57 @@
     description: Whether traffic shaping rules are applied to clients on your SSID.
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidTrafficShapingRules
-  description: Complete reference of the updateNetworkWirelessSsidTrafficShapingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-traffic-shaping-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_traffic_shaping_rules,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/trafficShaping/rules,
+  - description: Complete reference of the updateNetworkWirelessSsidTrafficShapingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-traffic-shaping-rules
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidTrafficShapingRules
+short_description: Resource module for networks _wireless _ssids _traffic _shaping
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_traffic_shaping_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     defaultRulesEnabled: true
     networkId: string
     number: string
     rules:
-    - definitions:
-      - type: host
-        value: google.com
-      dscpTagValue: 0
-      pcpTagValue: 0
-      perClientBandwidthLimits:
-        bandwidthLimits:
-          limitDown: 1000000
-          limitUp: 1000000
-        settings: custom
+      - definitions:
+          - type: host
+            value: google.com
+        dscpTagValue: 0
+        pcpTagValue: 0
+        perClientBandwidthLimits:
+          bandwidthLimits:
+            limitDown: 1000000
+            limitUp: 1000000
+          settings: custom
     trafficShapingEnabled: true
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_traffic_shaping_rules_info.py b/plugins/modules/networks_wireless_ssids_traffic_shaping_rules_info.py
index 8d12c9835..dab84ed0a 100644
--- a/plugins/modules/networks_wireless_ssids_traffic_shaping_rules_info.py
+++ b/plugins/modules/networks_wireless_ssids_traffic_shaping_rules_info.py
@@ -5,70 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_traffic_shaping_rules_info
-short_description: Information module for networks _wireless _ssids _traffic _shaping _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _traffic _shaping _rules.
-- Display the traffic shaping settings for a SSID on an MR network.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _traffic _shaping _rules.
+  - Display the traffic shaping settings for a SSID on an MR network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_traffic_shaping_rules_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_traffic_shaping_rules,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/trafficShaping/rules,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidTrafficShapingRules
-  description: Complete reference of the getNetworkWirelessSsidTrafficShapingRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-traffic-shaping-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_traffic_shaping_rules,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/trafficShaping/rules,
+  - description: Complete reference of the getNetworkWirelessSsidTrafficShapingRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-traffic-shaping-rules
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidTrafficShapingRules
+short_description: Information module for networks _wireless _ssids _traffic _shaping
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _traffic _shaping _rules
   cisco.meraki.networks_wireless_ssids_traffic_shaping_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_vpn.py b/plugins/modules/networks_wireless_ssids_vpn.py
index 028933127..7abc1874f 100644
--- a/plugins/modules/networks_wireless_ssids_vpn.py
+++ b/plugins/modules/networks_wireless_ssids_vpn.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_vpn
-short_description: Resource module for networks _wireless _ssids _vpn
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource networks _wireless _ssids _vpn.
-- Update the VPN settings for the SSID.
-version_added: '2.16.0'
+  - Manage operation update of the resource networks _wireless _ssids _vpn.
+  - Update the VPN settings for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_vpn
+notes:
+  - SDK Method used are wireless.Wireless.update_network_wireless_ssid_vpn,
+  - Paths used are put /networks/{networkId}/wireless/ssids/{number}/vpn,
 options:
   concentrator:
     description: The VPN concentrator settings for this SSID.
@@ -64,8 +64,8 @@
               domain names (FQDN) or 'any'.
             type: str
           destPort:
-            description: Destination port for this split tunnel rule, (integer in the
-              range 1-65535), or 'any'.
+            description: Destination port for this split tunnel rule, (integer in
+              the range 1-65535), or 'any'.
             type: str
           policy:
             description: Traffic policy specified for this split tunnel rule, 'allow'
@@ -77,43 +77,39 @@
         type: list
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidVpn
-  description: Complete reference of the updateNetworkWirelessSsidVpn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-vpn
-notes:
-  - SDK Method used are
-    wireless.Wireless.update_network_wireless_ssid_vpn,
-
-  - Paths used are
-    put /networks/{networkId}/wireless/ssids/{number}/vpn,
+  - description: Complete reference of the updateNetworkWirelessSsidVpn API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-network-wireless-ssid-vpn
+    name: Cisco Meraki documentation for wireless updateNetworkWirelessSsidVpn
+short_description: Resource module for networks _wireless _ssids _vpn
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.networks_wireless_ssids_vpn:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     concentrator:
       name: some concentrator name
@@ -128,16 +124,15 @@
     splitTunnel:
       enabled: true
       rules:
-      - comment: split tunnel rule 1
-        destCidr: 1.1.1.1/32
-        destPort: any
-        policy: allow
-        protocol: Any
-      - comment: split tunnel rule 2
-        destCidr: foo.com
-        destPort: any
-        policy: deny
-
+        - comment: split tunnel rule 1
+          destCidr: 1.1.1.1/32
+          destPort: any
+          policy: allow
+          protocol: Any
+        - comment: split tunnel rule 2
+          destCidr: foo.com
+          destPort: any
+          policy: deny
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_ssids_vpn_info.py b/plugins/modules/networks_wireless_ssids_vpn_info.py
index 3b19e185a..1d440da34 100644
--- a/plugins/modules/networks_wireless_ssids_vpn_info.py
+++ b/plugins/modules/networks_wireless_ssids_vpn_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_ssids_vpn_info
-short_description: Information module for networks _wireless _ssids _vpn
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _ssids _vpn.
-- List the VPN settings for the SSID.
-version_added: '2.16.0'
+  - Get all networks _wireless _ssids _vpn.
+  - List the VPN settings for the SSID.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_ssids_vpn_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_ssid_vpn,
+  - Paths used are get /networks/{networkId}/wireless/ssids/{number}/vpn,
 options:
   headers:
     description: Additional headers.
     type: dict
   networkId:
     description:
-    - NetworkId path parameter. Network ID.
+      - NetworkId path parameter. Network ID.
     type: str
   number:
     description:
-    - Number path parameter.
+      - Number path parameter.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessSsidVpn
-  description: Complete reference of the getNetworkWirelessSsidVpn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-vpn
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_ssid_vpn,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/ssids/{number}/vpn,
+  - description: Complete reference of the getNetworkWirelessSsidVpn API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-ssid-vpn
+    name: Cisco Meraki documentation for wireless getNetworkWirelessSsidVpn
+short_description: Information module for networks _wireless _ssids _vpn
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _ssids _vpn
   cisco.meraki.networks_wireless_ssids_vpn_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     number: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/networks_wireless_usage_history_info.py b/plugins/modules/networks_wireless_usage_history_info.py
index 9c2f0628b..6306d6df7 100644
--- a/plugins/modules/networks_wireless_usage_history_info.py
+++ b/plugins/modules/networks_wireless_usage_history_info.py
@@ -5,116 +5,122 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: networks_wireless_usage_history_info
-short_description: Information module for networks _wireless _usage _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all networks _wireless _usage _history.
-- Return AP usage over time for a device or network client.
-version_added: '2.16.0'
+  - Get all networks _wireless _usage _history.
+  - Return AP usage over time for a device or network client.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: networks_wireless_usage_history_info
+notes:
+  - SDK Method used are wireless.Wireless.get_network_wireless_usage_history,
+  - Paths used are get /networks/{networkId}/wireless/usageHistory,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  networkId:
-    description:
-    - NetworkId path parameter. Network ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+  apTag:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - ApTag query parameter. Filter results by AP tag; either clientId or deviceSerial
+        must be jointly specified.
     type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
-    type: float
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
   autoResolution:
     description:
-    - >
-      AutoResolution query parameter. Automatically select a data resolution based on the given timespan; this
-      overrides the value specified by the 'resolution' parameter. The default setting is false.
+      - 'AutoResolution query parameter. Automatically select a data resolution based
+        on the given timespan; this overrides the value specified by the ''resolution''
+        parameter. The default setting is false.
+
+        '
     type: bool
+  band:
+    description:
+      - Band query parameter. Filter results by band (either '2.4', '5' or '6').
+    type: str
   clientId:
     description:
-    - >
-      ClientId query parameter. Filter results by network client to return per-device AP usage over time inner
-      joined by the queried client's connection history.
+      - 'ClientId query parameter. Filter results by network client to return per-device
+        AP usage over time inner joined by the queried client''s connection history.
+
+        '
     type: str
   deviceSerial:
     description:
-    - DeviceSerial query parameter. Filter results by device. Requires band.
+      - DeviceSerial query parameter. Filter results by device. Requires band.
     type: str
-  apTag:
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - ApTag query parameter. Filter results by AP tag; either clientId or deviceSerial must be jointly specified.
+      - NetworkId path parameter. Network ID.
     type: str
-  band:
+  resolution:
     description:
-    - Band query parameter. Filter results by band (either '2.4', '5' or '6').
-    type: str
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   ssid:
     description:
-    - Ssid query parameter. Filter results by SSID number.
+      - Ssid query parameter. Filter results by SSID number.
     type: int
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  t1:
+    description:
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getNetworkWirelessUsageHistory
-  description: Complete reference of the getNetworkWirelessUsageHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-usage-history
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_network_wireless_usage_history,
-
-  - Paths used are
-    get /networks/{networkId}/wireless/usageHistory,
+  - description: Complete reference of the getNetworkWirelessUsageHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-network-wireless-usage-history
+    name: Cisco Meraki documentation for wireless getNetworkWirelessUsageHistory
+short_description: Information module for networks _wireless _usage _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all networks _wireless _usage _history
   cisco.meraki.networks_wireless_usage_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     resolution: 0
-    autoResolution: True
+    autoResolution: true
     clientId: string
     deviceSerial: string
     apTag: string
@@ -122,7 +128,6 @@
     ssid: 0
     networkId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations.py b/plugins/modules/organizations.py
index 9c5e6a5fb..549526b61 100644
--- a/plugins/modules/organizations.py
+++ b/plugins/modules/organizations.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations
-short_description: Resource module for organizations
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations.
-- Create a new organization.
-- Delete an organization.
-- Update an organization.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations.
+  - Create a new organization.
+  - Delete an organization.
+  - Update an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations
+notes:
+  - SDK Method used are organizations.Organizations.create_organization, organizations.Organizations.delete_organization,
+    organizations.Organizations.update_organization,
+  - Paths used are post /organizations, delete /organizations/{organizationId}, put
+    /organizations/{organizationId},
 options:
   api:
     description: API-specific settings.
@@ -47,117 +49,106 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganization
-  description: Complete reference of the createOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization
-- name: Cisco Meraki documentation for organizations deleteOrganization
-  description: Complete reference of the deleteOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization
-- name: Cisco Meraki documentation for organizations updateOrganization
-  description: Complete reference of the updateOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization,
-    organizations.Organizations.delete_organization,
-    organizations.Organizations.update_organization,
-
-  - Paths used are
-    post /organizations,
-    delete /organizations/{organizationId},
-    put /organizations/{organizationId},
+  - description: Complete reference of the createOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization
+    name: Cisco Meraki documentation for organizations createOrganization
+  - description: Complete reference of the deleteOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization
+    name: Cisco Meraki documentation for organizations deleteOrganization
+  - description: Complete reference of the updateOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization
+    name: Cisco Meraki documentation for organizations updateOrganization
+short_description: Resource module for organizations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     management:
       details:
-      - name: MSP ID
-        value: '123456'
+        - name: MSP ID
+          value: '123456'
     name: My organization
-
 - name: Delete by id
   cisco.meraki.organizations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     api:
       enabled: true
     management:
       details:
-      - name: MSP ID
-        value: '123456'
+        - name: MSP ID
+          value: '123456'
     name: My organization
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_action_batches.py b/plugins/modules/organizations_action_batches.py
index 2ebf79aa4..e19926c19 100644
--- a/plugins/modules/organizations_action_batches.py
+++ b/plugins/modules/organizations_action_batches.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_action_batches
-short_description: Resource module for organizations _action _batches
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _action _batches.
-- Create an action batch.
-- Delete an action batch.
-- Update an action batch.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _action
+    _batches.
+  - Create an action batch.
+  - Delete an action batch.
+  - Update an action batch.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_action_batches
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_action_batch,
+    organizations.Organizations.delete_organization_action_batch, organizations.Organizations.update_organization_action_batch,
+  - Paths used are post /organizations/{organizationId}/actionBatches, delete /organizations/{organizationId}/actionBatches/{actionBatchId},
+    put /organizations/{organizationId}/actionBatches/{actionBatchId},
 options:
   actionBatchId:
     description: ActionBatchId path parameter. Action batch ID.
@@ -44,8 +47,8 @@
         description: The webhook receiver used for the callback webhook.
         suboptions:
           id:
-            description: The webhook receiver ID that will receive information. If specifying
-              this, please leave the url and sharedSecret fields blank.
+            description: The webhook receiver ID that will receive information. If
+              specifying this, please leave the url and sharedSecret fields blank.
             type: str
         type: dict
       payloadTemplate:
@@ -57,13 +60,13 @@
             type: str
         type: dict
       sharedSecret:
-        description: A shared secret that will be included in the requests sent to the
-          callback URL. It can be used to verify that the request was sent by Meraki.
-          If using this field, please also specify an url.
+        description: A shared secret that will be included in the requests sent to
+          the callback URL. It can be used to verify that the request was sent by
+          Meraki. If using this field, please also specify an url.
         type: str
       url:
-        description: The callback URL for the webhook target. If using this field, please
-          also specify a sharedSecret.
+        description: The callback URL for the webhook target. If using this field,
+          please also specify a sharedSecret.
         type: str
     type: dict
   confirmed:
@@ -79,57 +82,49 @@
       most 20 actions in synchronous batch. Defaults to false.
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationActionBatch
-  description: Complete reference of the createOrganizationActionBatch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-action-batch
-- name: Cisco Meraki documentation for organizations deleteOrganizationActionBatch
-  description: Complete reference of the deleteOrganizationActionBatch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-action-batch
-- name: Cisco Meraki documentation for organizations updateOrganizationActionBatch
-  description: Complete reference of the updateOrganizationActionBatch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-action-batch
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_action_batch,
-    organizations.Organizations.delete_organization_action_batch,
-    organizations.Organizations.update_organization_action_batch,
-
-  - Paths used are
-    post /organizations/{organizationId}/actionBatches,
-    delete /organizations/{organizationId}/actionBatches/{actionBatchId},
-    put /organizations/{organizationId}/actionBatches/{actionBatchId},
+  - description: Complete reference of the createOrganizationActionBatch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-action-batch
+    name: Cisco Meraki documentation for organizations createOrganizationActionBatch
+  - description: Complete reference of the deleteOrganizationActionBatch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-action-batch
+    name: Cisco Meraki documentation for organizations deleteOrganizationActionBatch
+  - description: Complete reference of the updateOrganizationActionBatch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-action-batch
+    name: Cisco Meraki documentation for organizations updateOrganizationActionBatch
+short_description: Resource module for organizations _action _batches
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_action_batches:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     actions:
-    - operation: create
-      resource: /devices/QXXX-XXXX-XXXX/switch/ports/3
+      - operation: create
+        resource: /devices/QXXX-XXXX-XXXX/switch/ports/3
     callback:
       httpServer:
         id: aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vd2ViaG9va3M=
@@ -140,61 +135,58 @@
     confirmed: true
     organizationId: string
     synchronous: true
-
 - name: Delete by id
   cisco.meraki.organizations_action_batches:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     actionBatchId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_action_batches:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     actionBatchId: string
     confirmed: true
     organizationId: string
     synchronous: false
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_action_batches_info.py b/plugins/modules/organizations_action_batches_info.py
index 30b763902..8b4ae96fa 100644
--- a/plugins/modules/organizations_action_batches_info.py
+++ b/plugins/modules/organizations_action_batches_info.py
@@ -5,107 +5,101 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_action_batches_info
-short_description: Information module for organizations _action _batches
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _action _batches.
-- Get organizations _action _batches by id.
-- Return an action batch.
-- Return the list of action batches in the organization.
-version_added: '2.16.0'
+  - Get all organizations _action _batches.
+  - Get organizations _action _batches by id.
+  - Return an action batch.
+  - Return the list of action batches in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_action_batches_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_action_batch,
+    organizations.Organizations.get_organization_action_batches,
+  - Paths used are get /organizations/{organizationId}/actionBatches, get /organizations/{organizationId}/actionBatches/{actionBatchId},
 options:
+  actionBatchId:
+    description:
+      - ActionBatchId path parameter. Action batch ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   status:
     description:
-    - Status query parameter. Filter batches by status. Valid types are pending, completed, and failed.
-    type: str
-  actionBatchId:
-    description:
-    - ActionBatchId path parameter. Action batch ID.
+      - Status query parameter. Filter batches by status. Valid types are pending,
+        completed, and failed.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationActionBatch
-  description: Complete reference of the getOrganizationActionBatch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-action-batch
-- name: Cisco Meraki documentation for organizations getOrganizationActionBatches
-  description: Complete reference of the getOrganizationActionBatches API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-action-batches
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_action_batch,
-    organizations.Organizations.get_organization_action_batches,
-
-  - Paths used are
-    get /organizations/{organizationId}/actionBatches,
-    get /organizations/{organizationId}/actionBatches/{actionBatchId},
+  - description: Complete reference of the getOrganizationActionBatch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-action-batch
+    name: Cisco Meraki documentation for organizations getOrganizationActionBatch
+  - description: Complete reference of the getOrganizationActionBatches API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-action-batches
+    name: Cisco Meraki documentation for organizations getOrganizationActionBatches
+short_description: Information module for organizations _action _batches
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _action _batches
   cisco.meraki.organizations_action_batches_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     status: string
     organizationId: string
   register: result
-
 - name: Get organizations _action _batches by id
   cisco.meraki.organizations_action_batches_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     actionBatchId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_acls.py b/plugins/modules/organizations_adaptive_policy_acls.py
index 15d6d26a8..7a5a9343e 100644
--- a/plugins/modules/organizations_adaptive_policy_acls.py
+++ b/plugins/modules/organizations_adaptive_policy_acls.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_acls
-short_description: Resource module for organizations _adaptive _policy _acls
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _adaptive _policy _acls.
-- Creates new adaptive policy ACL.
-- Deletes the specified adaptive policy ACL. Note this adaptive policy ACL will also be removed from policies using it.
-- Updates an adaptive policy ACL.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _adaptive
+    _policy _acls.
+  - Creates new adaptive policy ACL.
+  - Deletes the specified adaptive policy ACL. Note this adaptive policy ACL will
+    also be removed from policies using it.
+  - Updates an adaptive policy ACL.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_acls
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_adaptive_policy_acl,
+    organizations.Organizations.delete_organization_adaptive_policy_acl, organizations.Organizations.update_organization_adaptive_policy_acl,
+  - Paths used are post /organizations/{organizationId}/adaptivePolicy/acls, delete
+    /organizations/{organizationId}/adaptivePolicy/acls/{aclId}, put /organizations/{organizationId}/adaptivePolicy/acls/{aclId},
 options:
   aclId:
     description: AclId path parameter. Acl ID.
@@ -39,8 +43,8 @@
     suboptions:
       dstPort:
         description: Destination port. Must be in the format of single port '1', port
-          list '1,2' or port range '1-10', and in the range of 1-65535, or 'any'. Default
-          is 'any'.
+          list '1,2' or port range '1-10', and in the range of 1-65535, or 'any'.
+          Default is 'any'.
         type: str
       policy:
         description: '''allow'' or ''deny'' traffic specified by this rule.'
@@ -55,112 +59,102 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyAcl
-  description: Complete reference of the createOrganizationAdaptivePolicyAcl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-acl
-- name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyAcl
-  description: Complete reference of the deleteOrganizationAdaptivePolicyAcl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-acl
-- name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyAcl
-  description: Complete reference of the updateOrganizationAdaptivePolicyAcl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-acl
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_adaptive_policy_acl,
-    organizations.Organizations.delete_organization_adaptive_policy_acl,
-    organizations.Organizations.update_organization_adaptive_policy_acl,
-
-  - Paths used are
-    post /organizations/{organizationId}/adaptivePolicy/acls,
-    delete /organizations/{organizationId}/adaptivePolicy/acls/{aclId},
-    put /organizations/{organizationId}/adaptivePolicy/acls/{aclId},
+  - description: Complete reference of the createOrganizationAdaptivePolicyAcl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-acl
+    name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyAcl
+  - description: Complete reference of the deleteOrganizationAdaptivePolicyAcl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-acl
+    name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyAcl
+  - description: Complete reference of the updateOrganizationAdaptivePolicyAcl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-acl
+    name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyAcl
+short_description: Resource module for organizations _adaptive _policy _acls
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_adaptive_policy_acls:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     description: Blocks sensitive web traffic
     ipVersion: ipv6
     name: Block sensitive web traffic
     organizationId: string
     rules:
-    - dstPort: 22-30
-      policy: deny
-      protocol: tcp
-      srcPort: 1,33
-
+      - dstPort: 22-30
+        policy: deny
+        protocol: tcp
+        srcPort: 1,33
 - name: Delete by id
   cisco.meraki.organizations_adaptive_policy_acls:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     aclId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_adaptive_policy_acls:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     aclId: string
     description: Blocks sensitive web traffic
@@ -168,11 +162,10 @@
     name: Block sensitive web traffic
     organizationId: string
     rules:
-    - dstPort: 22-30
-      policy: deny
-      protocol: tcp
-      srcPort: 1,33
-
+      - dstPort: 22-30
+        policy: deny
+        protocol: tcp
+        srcPort: 1,33
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_acls_info.py b/plugins/modules/organizations_adaptive_policy_acls_info.py
index 473079630..159ea6dc8 100644
--- a/plugins/modules/organizations_adaptive_policy_acls_info.py
+++ b/plugins/modules/organizations_adaptive_policy_acls_info.py
@@ -5,102 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_acls_info
-short_description: Information module for organizations _adaptive _policy _acls
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _adaptive _policy _acls.
-- Get organizations _adaptive _policy _acls by id.
-- List adaptive policy ACLs in a organization.
-- Returns the adaptive policy ACL information.
-version_added: '2.16.0'
+  - Get all organizations _adaptive _policy _acls.
+  - Get organizations _adaptive _policy _acls by id.
+  - List adaptive policy ACLs in a organization.
+  - Returns the adaptive policy ACL information.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_acls_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_adaptive_policy_acl,
+    organizations.Organizations.get_organization_adaptive_policy_acls,
+  - Paths used are get /organizations/{organizationId}/adaptivePolicy/acls, get /organizations/{organizationId}/adaptivePolicy/acls/{aclId},
 options:
+  aclId:
+    description:
+      - AclId path parameter. Acl ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  aclId:
-    description:
-    - AclId path parameter. Acl ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyAcl
-  description: Complete reference of the getOrganizationAdaptivePolicyAcl API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-acl
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyAcls
-  description: Complete reference of the getOrganizationAdaptivePolicyAcls API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-acls
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_adaptive_policy_acl,
-    organizations.Organizations.get_organization_adaptive_policy_acls,
-
-  - Paths used are
-    get /organizations/{organizationId}/adaptivePolicy/acls,
-    get /organizations/{organizationId}/adaptivePolicy/acls/{aclId},
+  - description: Complete reference of the getOrganizationAdaptivePolicyAcl API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-acl
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyAcl
+  - description: Complete reference of the getOrganizationAdaptivePolicyAcls API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-acls
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyAcls
+short_description: Information module for organizations _adaptive _policy _acls
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _adaptive _policy _acls
   cisco.meraki.organizations_adaptive_policy_acls_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _adaptive _policy _acls by id
   cisco.meraki.organizations_adaptive_policy_acls_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     aclId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_groups.py b/plugins/modules/organizations_adaptive_policy_groups.py
index 7c3da0202..1248a9432 100644
--- a/plugins/modules/organizations_adaptive_policy_groups.py
+++ b/plugins/modules/organizations_adaptive_policy_groups.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_groups
-short_description: Resource module for organizations _adaptive _policy _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _adaptive _policy _groups.
-- Creates a new adaptive policy group.
-- Deletes the specified adaptive policy group and any associated policies and references.
-- Updates an adaptive policy group. If updating "Infrastructure", only the SGT is allowed. Cannot update "Unknown".
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _adaptive
+    _policy _groups.
+  - Creates a new adaptive policy group.
+  - Deletes the specified adaptive policy group and any associated policies and references.
+  - Updates an adaptive policy group. If updating "Infrastructure", only the SGT is
+    allowed. Cannot update "Unknown".
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_groups
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_adaptive_policy_group,
+    organizations.Organizations.delete_organization_adaptive_policy_group, organizations.Organizations.update_organization_adaptive_policy_group,
+  - Paths used are post /organizations/{organizationId}/adaptivePolicy/groups, delete
+    /organizations/{organizationId}/adaptivePolicy/groups/{id}, put /organizations/{organizationId}/adaptivePolicy/groups/{id},
 options:
   description:
     description: Description of the group (default "").
@@ -32,9 +36,9 @@
     type: str
   policyObjects:
     description: The policy objects that belong to this group; traffic from addresses
-      specified by these policy objects will be tagged with this group's SGT value if
-      no other tagging scheme is being used (each requires one unique attribute) (default
-      ).
+      specified by these policy objects will be tagged with this group's SGT value
+      if no other tagging scheme is being used (each requires one unique attribute)
+      (default ).
     elements: dict
     suboptions:
       id:
@@ -48,120 +52,109 @@
     description: SGT value of the group.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyGroup
-  description: Complete reference of the createOrganizationAdaptivePolicyGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-group
-- name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyGroup
-  description: Complete reference of the deleteOrganizationAdaptivePolicyGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-group
-- name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyGroup
-  description: Complete reference of the updateOrganizationAdaptivePolicyGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-group
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_adaptive_policy_group,
-    organizations.Organizations.delete_organization_adaptive_policy_group,
-    organizations.Organizations.update_organization_adaptive_policy_group,
-
-  - Paths used are
-    post /organizations/{organizationId}/adaptivePolicy/groups,
-    delete /organizations/{organizationId}/adaptivePolicy/groups/{id},
-    put /organizations/{organizationId}/adaptivePolicy/groups/{id},
+  - description: Complete reference of the createOrganizationAdaptivePolicyGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-group
+    name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyGroup
+  - description: Complete reference of the deleteOrganizationAdaptivePolicyGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-group
+    name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyGroup
+  - description: Complete reference of the updateOrganizationAdaptivePolicyGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-group
+    name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyGroup
+short_description: Resource module for organizations _adaptive _policy _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_adaptive_policy_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     description: Group of XYZ Corp Employees
     name: Employee Group
     organizationId: string
     policyObjects:
-    - id: '2345'
-      name: Example Policy Object
+      - id: '2345'
+        name: Example Policy Object
     sgt: 1000
-
 - name: Delete by id
   cisco.meraki.organizations_adaptive_policy_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     id: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_adaptive_policy_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     description: Group of XYZ Corp Employees
     id: string
     name: Employee Group
     organizationId: string
     policyObjects:
-    - id: '2345'
-      name: Example Policy Object
+      - id: '2345'
+        name: Example Policy Object
     sgt: 1000
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_groups_info.py b/plugins/modules/organizations_adaptive_policy_groups_info.py
index a52a2e349..9fdecbb1d 100644
--- a/plugins/modules/organizations_adaptive_policy_groups_info.py
+++ b/plugins/modules/organizations_adaptive_policy_groups_info.py
@@ -5,102 +5,96 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_groups_info
-short_description: Information module for organizations _adaptive _policy _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _adaptive _policy _groups.
-- Get organizations _adaptive _policy _groups by id.
-- List adaptive policy groups in a organization.
-- Returns an adaptive policy group.
-version_added: '2.16.0'
+  - Get all organizations _adaptive _policy _groups.
+  - Get organizations _adaptive _policy _groups by id.
+  - List adaptive policy groups in a organization.
+  - Returns an adaptive policy group.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_groups_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_adaptive_policy_group,
+    organizations.Organizations.get_organization_adaptive_policy_groups,
+  - Paths used are get /organizations/{organizationId}/adaptivePolicy/groups, get
+    /organizations/{organizationId}/adaptivePolicy/groups/{id},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  id:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - Id path parameter.
     type: str
-  id:
+  organizationId:
     description:
-    - Id path parameter.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyGroup
-  description: Complete reference of the getOrganizationAdaptivePolicyGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-group
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyGroups
-  description: Complete reference of the getOrganizationAdaptivePolicyGroups API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-groups
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_adaptive_policy_group,
-    organizations.Organizations.get_organization_adaptive_policy_groups,
-
-  - Paths used are
-    get /organizations/{organizationId}/adaptivePolicy/groups,
-    get /organizations/{organizationId}/adaptivePolicy/groups/{id},
+  - description: Complete reference of the getOrganizationAdaptivePolicyGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-group
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyGroup
+  - description: Complete reference of the getOrganizationAdaptivePolicyGroups API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-groups
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyGroups
+short_description: Information module for organizations _adaptive _policy _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _adaptive _policy _groups
   cisco.meraki.organizations_adaptive_policy_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _adaptive _policy _groups by id
   cisco.meraki.organizations_adaptive_policy_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     id: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_overview_info.py b/plugins/modules/organizations_adaptive_policy_overview_info.py
index c036edf6a..b26f2f5e9 100644
--- a/plugins/modules/organizations_adaptive_policy_overview_info.py
+++ b/plugins/modules/organizations_adaptive_policy_overview_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_overview_info
-short_description: Information module for organizations _adaptive _policy _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _adaptive _policy _overview.
-- Returns adaptive policy aggregate statistics for an organization.
-version_added: '2.16.0'
+  - Get all organizations _adaptive _policy _overview.
+  - Returns adaptive policy aggregate statistics for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_adaptive_policy_overview,
+  - Paths used are get /organizations/{organizationId}/adaptivePolicy/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyOverview
-  description: Complete reference of the getOrganizationAdaptivePolicyOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_adaptive_policy_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/adaptivePolicy/overview,
+  - description: Complete reference of the getOrganizationAdaptivePolicyOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-overview
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyOverview
+short_description: Information module for organizations _adaptive _policy _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _adaptive _policy _overview
   cisco.meraki.organizations_adaptive_policy_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_policies.py b/plugins/modules/organizations_adaptive_policy_policies.py
index 06cf674de..703efb3ef 100644
--- a/plugins/modules/organizations_adaptive_policy_policies.py
+++ b/plugins/modules/organizations_adaptive_policy_policies.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_policies
-short_description: Resource module for organizations _adaptive _policy _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _adaptive _policy _policies.
-- Add an Adaptive Policy.
-- Delete an Adaptive Policy.
-- Update an Adaptive Policy.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _adaptive
+    _policy _policies.
+  - Add an Adaptive Policy.
+  - Delete an Adaptive Policy.
+  - Update an Adaptive Policy.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_policies
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_adaptive_policy_policy,
+    organizations.Organizations.delete_organization_adaptive_policy_policy, organizations.Organizations.update_organization_adaptive_policy_policy,
+  - Paths used are post /organizations/{organizationId}/adaptivePolicy/policies, delete
+    /organizations/{organizationId}/adaptivePolicy/policies/{id}, put /organizations/{organizationId}/adaptivePolicy/policies/{id},
 options:
   acls:
     description: An ordered array of adaptive policy ACLs (each requires one unique
@@ -66,57 +69,52 @@
         type: int
     type: dict
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyPolicy
-  description: Complete reference of the createOrganizationAdaptivePolicyPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-policy
-- name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyPolicy
-  description: Complete reference of the deleteOrganizationAdaptivePolicyPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-policy
-- name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyPolicy
-  description: Complete reference of the updateOrganizationAdaptivePolicyPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-policy
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_adaptive_policy_policy,
-    organizations.Organizations.delete_organization_adaptive_policy_policy,
-    organizations.Organizations.update_organization_adaptive_policy_policy,
-
-  - Paths used are
-    post /organizations/{organizationId}/adaptivePolicy/policies,
-    delete /organizations/{organizationId}/adaptivePolicy/policies/{id},
-    put /organizations/{organizationId}/adaptivePolicy/policies/{id},
+  - description: Complete reference of the createOrganizationAdaptivePolicyPolicy
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-adaptive-policy-policy
+    name: Cisco Meraki documentation for organizations createOrganizationAdaptivePolicyPolicy
+  - description: Complete reference of the deleteOrganizationAdaptivePolicyPolicy
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-adaptive-policy-policy
+    name: Cisco Meraki documentation for organizations deleteOrganizationAdaptivePolicyPolicy
+  - description: Complete reference of the updateOrganizationAdaptivePolicyPolicy
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-policy
+    name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicyPolicy
+short_description: Resource module for organizations _adaptive _policy _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_adaptive_policy_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     acls:
-    - id: '444'
-      name: Block web
+      - id: '444'
+        name: Block web
     destinationGroup:
       id: '333'
       name: IoT Servers
@@ -127,59 +125,57 @@
       id: '222'
       name: IoT Devices
       sgt: 50
-
 - name: Delete by id
   cisco.meraki.organizations_adaptive_policy_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     id: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_adaptive_policy_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     acls:
-    - id: '444'
-      name: Block web
+      - id: '444'
+        name: Block web
     destinationGroup:
       id: '333'
       name: IoT Servers
@@ -191,7 +187,6 @@
       id: '222'
       name: IoT Devices
       sgt: 50
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_policies_info.py b/plugins/modules/organizations_adaptive_policy_policies_info.py
index 3de3cf69f..9d97ea169 100644
--- a/plugins/modules/organizations_adaptive_policy_policies_info.py
+++ b/plugins/modules/organizations_adaptive_policy_policies_info.py
@@ -5,102 +5,96 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_policies_info
-short_description: Information module for organizations _adaptive _policy _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _adaptive _policy _policies.
-- Get organizations _adaptive _policy _policies by id.
-- List adaptive policies in an organization.
-- Return an adaptive policy.
-version_added: '2.16.0'
+  - Get all organizations _adaptive _policy _policies.
+  - Get organizations _adaptive _policy _policies by id.
+  - List adaptive policies in an organization.
+  - Return an adaptive policy.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_policies_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_adaptive_policy_policies,
+    organizations.Organizations.get_organization_adaptive_policy_policy,
+  - Paths used are get /organizations/{organizationId}/adaptivePolicy/policies, get
+    /organizations/{organizationId}/adaptivePolicy/policies/{id},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  id:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - Id path parameter.
     type: str
-  id:
+  organizationId:
     description:
-    - Id path parameter.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyPolicies
-  description: Complete reference of the getOrganizationAdaptivePolicyPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-policies
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyPolicy
-  description: Complete reference of the getOrganizationAdaptivePolicyPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-policy
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_adaptive_policy_policies,
-    organizations.Organizations.get_organization_adaptive_policy_policy,
-
-  - Paths used are
-    get /organizations/{organizationId}/adaptivePolicy/policies,
-    get /organizations/{organizationId}/adaptivePolicy/policies/{id},
+  - description: Complete reference of the getOrganizationAdaptivePolicyPolicies API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-policies
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyPolicies
+  - description: Complete reference of the getOrganizationAdaptivePolicyPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-policy
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicyPolicy
+short_description: Information module for organizations _adaptive _policy _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _adaptive _policy _policies
   cisco.meraki.organizations_adaptive_policy_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _adaptive _policy _policies by id
   cisco.meraki.organizations_adaptive_policy_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     id: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_settings.py b/plugins/modules/organizations_adaptive_policy_settings.py
index 3dee61718..c337c3ca5 100644
--- a/plugins/modules/organizations_adaptive_policy_settings.py
+++ b/plugins/modules/organizations_adaptive_policy_settings.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_settings
-short_description: Resource module for organizations _adaptive _policy _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _adaptive _policy _settings.
-- Update global adaptive policy settings.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _adaptive _policy _settings.
+  - Update global adaptive policy settings.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_settings
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_adaptive_policy_settings,
+  - Paths used are put /organizations/{organizationId}/adaptivePolicy/settings,
 options:
   enabledNetworks:
     description: List of network IDs with adaptive policy enabled.
@@ -24,51 +24,47 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicySettings
-  description: Complete reference of the updateOrganizationAdaptivePolicySettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-settings
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_adaptive_policy_settings,
-
-  - Paths used are
-    put /organizations/{organizationId}/adaptivePolicy/settings,
+  - description: Complete reference of the updateOrganizationAdaptivePolicySettings
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-adaptive-policy-settings
+    name: Cisco Meraki documentation for organizations updateOrganizationAdaptivePolicySettings
+short_description: Resource module for organizations _adaptive _policy _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_adaptive_policy_settings:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabledNetworks:
-    - L_11111111
-    - L_22222222
-    - N_33333333
-    - L_44444444
+      - L_11111111
+      - L_22222222
+      - N_33333333
+      - L_44444444
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_adaptive_policy_settings_info.py b/plugins/modules/organizations_adaptive_policy_settings_info.py
index c405ccef2..3bc9a8248 100644
--- a/plugins/modules/organizations_adaptive_policy_settings_info.py
+++ b/plugins/modules/organizations_adaptive_policy_settings_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_adaptive_policy_settings_info
-short_description: Information module for organizations _adaptive _policy _settings
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _adaptive _policy _settings.
-- Returns global adaptive policy settings in an organization.
-version_added: '2.16.0'
+  - Get all organizations _adaptive _policy _settings.
+  - Returns global adaptive policy settings in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_adaptive_policy_settings_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_adaptive_policy_settings,
+  - Paths used are get /organizations/{organizationId}/adaptivePolicy/settings,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicySettings
-  description: Complete reference of the getOrganizationAdaptivePolicySettings API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-settings
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_adaptive_policy_settings,
-
-  - Paths used are
-    get /organizations/{organizationId}/adaptivePolicy/settings,
+  - description: Complete reference of the getOrganizationAdaptivePolicySettings API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-adaptive-policy-settings
+    name: Cisco Meraki documentation for organizations getOrganizationAdaptivePolicySettings
+short_description: Information module for organizations _adaptive _policy _settings
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _adaptive _policy _settings
   cisco.meraki.organizations_adaptive_policy_settings_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_admins.py b/plugins/modules/organizations_admins.py
index 658c22517..cd046d98f 100644
--- a/plugins/modules/organizations_admins.py
+++ b/plugins/modules/organizations_admins.py
@@ -5,29 +5,31 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_admins
-short_description: Resource module for organizations _admins
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _admins.
-- Create a new dashboard administrator.
-- Revoke all access for a dashboard administrator within this organization.
-- Update an administrator.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _admins.
+  - Create a new dashboard administrator.
+  - Revoke all access for a dashboard administrator within this organization.
+  - Update an administrator.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_admins
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_admin, organizations.Organizations.delete_organization_admin,
+    organizations.Organizations.update_organization_admin,
+  - Paths used are post /organizations/{organizationId}/admins, delete /organizations/{organizationId}/admins/{adminId},
+    put /organizations/{organizationId}/admins/{adminId},
 options:
   adminId:
     description: AdminId path parameter. Admin ID.
     type: str
   authenticationMethod:
-    description: No longer used as of Cisco SecureX end-of-life. Can be one of 'Email'.
-      The default is Email authentication.
+    description: false longer used as of Cisco SecureX end-of-life. Can be one of
+      'Email'. The default is Email authentication.
     type: str
   email:
-    description: The email of the dashboard administrator. This attribute can not be
-      updated.
+    description: The email of the dashboard administrator. This attribute can not
+      be updated.
     type: str
   name:
     description: The name of the dashboard administrator.
@@ -38,153 +40,143 @@
     elements: dict
     suboptions:
       access:
-        description: The privilege of the dashboard administrator on the network. Can
-          be one of 'full', 'read-only', 'guest-ambassador' or 'monitor-only'.
+        description: The privilege of the dashboard administrator on the network.
+          Can be one of 'full', 'read-only', 'guest-ambassador' or 'monitor-only'.
         type: str
       id:
         description: The network ID.
         type: str
     type: list
   orgAccess:
-    description: The privilege of the dashboard administrator on the organization. Can
-      be one of 'full', 'read-only', 'enterprise' or 'none'.
+    description: The privilege of the dashboard administrator on the organization.
+      Can be one of 'full', 'read-only', 'enterprise' or 'none'.
     type: str
   organizationId:
     description: OrganizationId path parameter. Organization ID.
     type: str
   tags:
-    description: The list of tags that the dashboard administrator has privileges on.
+    description: The list of tags that the dashboard administrator has privileges
+      on.
     elements: dict
     suboptions:
       access:
-        description: The privilege of the dashboard administrator on the tag. Can be
-          one of 'full', 'read-only', 'guest-ambassador' or 'monitor-only'.
+        description: The privilege of the dashboard administrator on the tag. Can
+          be one of 'full', 'read-only', 'guest-ambassador' or 'monitor-only'.
         type: str
       tag:
         description: The name of the tag.
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationAdmin
-  description: Complete reference of the createOrganizationAdmin API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-admin
-- name: Cisco Meraki documentation for organizations deleteOrganizationAdmin
-  description: Complete reference of the deleteOrganizationAdmin API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-admin
-- name: Cisco Meraki documentation for organizations updateOrganizationAdmin
-  description: Complete reference of the updateOrganizationAdmin API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-admin
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_admin,
-    organizations.Organizations.delete_organization_admin,
-    organizations.Organizations.update_organization_admin,
-
-  - Paths used are
-    post /organizations/{organizationId}/admins,
-    delete /organizations/{organizationId}/admins/{adminId},
-    put /organizations/{organizationId}/admins/{adminId},
+  - description: Complete reference of the createOrganizationAdmin API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-admin
+    name: Cisco Meraki documentation for organizations createOrganizationAdmin
+  - description: Complete reference of the deleteOrganizationAdmin API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-admin
+    name: Cisco Meraki documentation for organizations deleteOrganizationAdmin
+  - description: Complete reference of the updateOrganizationAdmin API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-admin
+    name: Cisco Meraki documentation for organizations updateOrganizationAdmin
+short_description: Resource module for organizations _admins
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_admins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     authenticationMethod: Email
     email: miles@meraki.com
     name: Miles Meraki
     networks:
-    - access: full
-      id: N_24329156
+      - access: full
+        id: N_24329156
     orgAccess: none
     organizationId: string
     tags:
-    - access: read-only
-      tag: west
-
+      - access: read-only
+        tag: west
 - name: Delete by id
   cisco.meraki.organizations_admins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     adminId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_admins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     adminId: string
     name: Miles Meraki
     networks:
-    - access: full
-      id: N_24329156
+      - access: full
+        id: N_24329156
     orgAccess: none
     organizationId: string
     tags:
-    - access: read-only
-      tag: west
-
+      - access: read-only
+        tag: west
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_admins_info.py b/plugins/modules/organizations_admins_info.py
index 166f274fd..9505e0f86 100644
--- a/plugins/modules/organizations_admins_info.py
+++ b/plugins/modules/organizations_admins_info.py
@@ -5,71 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_admins_info
-short_description: Information module for organizations _admins
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _admins.
-- List the dashboard administrators in this organization.
-version_added: '2.16.0'
+  - Get all organizations _admins.
+  - List the dashboard administrators in this organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_admins_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_admins,
+  - Paths used are get /organizations/{organizationId}/admins,
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter the result set by the included set of network IDs.
+      - NetworkIds query parameter. Optional parameter to filter the result set by
+        the included set of network IDs.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAdmins
-  description: Complete reference of the getOrganizationAdmins API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-admins
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_admins,
-
-  - Paths used are
-    get /organizations/{organizationId}/admins,
+  - description: Complete reference of the getOrganizationAdmins API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-admins
+    name: Cisco Meraki documentation for organizations getOrganizationAdmins
+short_description: Information module for organizations _admins
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _admins
   cisco.meraki.organizations_admins_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_alerts_profiles.py b/plugins/modules/organizations_alerts_profiles.py
index e57f96bee..5a1b0b10f 100644
--- a/plugins/modules/organizations_alerts_profiles.py
+++ b/plugins/modules/organizations_alerts_profiles.py
@@ -5,25 +5,28 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_alerts_profiles
-short_description: Resource module for organizations _alerts _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _alerts _profiles.
-- Create an organization-wide alert configuration.
-- Removes an organization-wide alert config.
-- Update an organization-wide alert config.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _alerts
+    _profiles.
+  - Create an organization-wide alert configuration.
+  - Removes an organization-wide alert config.
+  - Update an organization-wide alert config.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_alerts_profiles
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_alerts_profile,
+    organizations.Organizations.delete_organization_alerts_profile, organizations.Organizations.update_organization_alerts_profile,
+  - Paths used are post /organizations/{organizationId}/alerts/profiles, delete /organizations/{organizationId}/alerts/profiles/{alertConfigId},
+    put /organizations/{organizationId}/alerts/profiles/{alertConfigId},
 options:
   alertCondition:
     description: The conditions that determine if the alert triggers.
     suboptions:
       bit_rate_bps:
-        description: The threshold the metric must cross to be valid for alerting. Used
-          only for WAN Utilization alerts.
+        description: The threshold the metric must cross to be valid for alerting.
+          Used only for WAN Utilization alerts.
         type: int
       duration:
         description: The total duration in seconds that the threshold should be crossed
@@ -34,16 +37,16 @@
           following wan1, wan2, wan3, cellular.
         type: str
       jitter_ms:
-        description: The threshold the metric must cross to be valid for alerting. Used
-          only for VoIP Jitter alerts.
+        description: The threshold the metric must cross to be valid for alerting.
+          Used only for VoIP Jitter alerts.
         type: int
       latency_ms:
-        description: The threshold the metric must cross to be valid for alerting. Used
-          only for WAN Latency alerts.
+        description: The threshold the metric must cross to be valid for alerting.
+          Used only for WAN Latency alerts.
         type: int
       loss_ratio:
-        description: The threshold the metric must cross to be valid for alerting. Used
-          only for Packet Loss alerts.
+        description: The threshold the metric must cross to be valid for alerting.
+          Used only for Packet Loss alerts.
         type: float
       mos:
         description: The threshold the metric must drop below to be valid for alerting.
@@ -86,53 +89,45 @@
     description: The alert type.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationAlertsProfile
-  description: Complete reference of the createOrganizationAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-alerts-profile
-- name: Cisco Meraki documentation for organizations deleteOrganizationAlertsProfile
-  description: Complete reference of the deleteOrganizationAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-alerts-profile
-- name: Cisco Meraki documentation for organizations updateOrganizationAlertsProfile
-  description: Complete reference of the updateOrganizationAlertsProfile API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-alerts-profile
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_alerts_profile,
-    organizations.Organizations.delete_organization_alerts_profile,
-    organizations.Organizations.update_organization_alerts_profile,
-
-  - Paths used are
-    post /organizations/{organizationId}/alerts/profiles,
-    delete /organizations/{organizationId}/alerts/profiles/{alertConfigId},
-    put /organizations/{organizationId}/alerts/profiles/{alertConfigId},
+  - description: Complete reference of the createOrganizationAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-alerts-profile
+    name: Cisco Meraki documentation for organizations createOrganizationAlertsProfile
+  - description: Complete reference of the deleteOrganizationAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-alerts-profile
+    name: Cisco Meraki documentation for organizations deleteOrganizationAlertsProfile
+  - description: Complete reference of the updateOrganizationAlertsProfile API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-alerts-profile
+    name: Cisco Meraki documentation for organizations updateOrganizationAlertsProfile
+short_description: Resource module for organizations _alerts _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     alertCondition:
       bit_rate_bps: 10000
@@ -145,64 +140,62 @@
       window: 600
     description: WAN 1 high utilization
     networkTags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     organizationId: string
     recipients:
       emails:
-      - admin@example.org
+        - admin@example.org
       httpServerIds:
-      - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vcGF0aA==
+        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vcGF0aA==
     type: wanUtilization
-
 - name: Delete by id
   cisco.meraki.organizations_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     alertConfigId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_alerts_profiles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     alertCondition:
       bit_rate_bps: 10000
@@ -217,16 +210,15 @@
     description: WAN 1 high utilization
     enabled: true
     networkTags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     organizationId: string
     recipients:
       emails:
-      - admin@example.org
+        - admin@example.org
       httpServerIds:
-      - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vcGF0aA==
+        - aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vcGF0aA==
     type: wanUtilization
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_api_requests_info.py b/plugins/modules/organizations_api_requests_info.py
index 127c23994..26ff83b36 100644
--- a/plugins/modules/organizations_api_requests_info.py
+++ b/plugins/modules/organizations_api_requests_info.py
@@ -5,131 +5,145 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_api_requests_info
-short_description: Information module for organizations _api _requests
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _api _requests.
-- List the API requests made by an organization.
-version_added: '2.16.0'
+  - Get all organizations _api _requests.
+  - List the API requests made by an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_api_requests_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_api_requests,
+  - Paths used are get /organizations/{organizationId}/apiRequests,
 options:
+  adminId:
+    description:
+      - AdminId query parameter. Filter the results by the ID of the admin who made
+        the API requests.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  method:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - 'Method query parameter. Filter the results by the method of the API requests
+        (must be ''GET'', ''PUT'', ''POST'' or ''DELETE'').
+
+        '
     type: str
-  t0:
+  operationIds:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  t1:
+      - OperationIds query parameter. Filter the results by one or more operation
+        IDs for the API request.
+    elements: str
+    type: list
+  organizationId:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  timespan:
+  path:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 31 days.
-    type: float
+      - Path query parameter. Filter the results by the path of the API requests.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
     type: int
-  startingAfter:
+  responseCode:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - ResponseCode query parameter. Filter the results by the response code of the
+        API requests.
+    type: int
+  sourceIp:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - SourceIp query parameter. Filter the results by the IP address of the originating
+        API request.
     type: str
-  adminId:
+  startingAfter:
     description:
-    - AdminId query parameter. Filter the results by the ID of the admin who made the API requests.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  path:
+  t0:
     description:
-    - Path query parameter. Filter the results by the path of the API requests.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
-  method:
+  t1:
     description:
-    - >
-      Method query parameter. Filter the results by the method of the API requests (must be 'GET', 'PUT', 'POST'
-      or 'DELETE').
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
-  responseCode:
-    description:
-    - ResponseCode query parameter. Filter the results by the response code of the API requests.
-    type: int
-  sourceIp:
+  timespan:
     description:
-    - SourceIp query parameter. Filter the results by the IP address of the originating API request.
-    type: str
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 31 days.
+
+        '
+    type: float
   userAgent:
     description:
-    - UserAgent query parameter. Filter the results by the user agent string of the API request.
+      - UserAgent query parameter. Filter the results by the user agent string of
+        the API request.
     type: str
   version:
     description:
-    - Version query parameter. Filter the results by the API version of the API request.
+      - Version query parameter. Filter the results by the API version of the API
+        request.
     type: int
-  operationIds:
-    description:
-    - OperationIds query parameter. Filter the results by one or more operation IDs for the API request.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationApiRequests
-  description: Complete reference of the getOrganizationApiRequests API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_api_requests,
-
-  - Paths used are
-    get /organizations/{organizationId}/apiRequests,
+  - description: Complete reference of the getOrganizationApiRequests API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests
+    name: Cisco Meraki documentation for organizations getOrganizationApiRequests
+short_description: Information module for organizations _api _requests
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _api _requests
   cisco.meraki.organizations_api_requests_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -148,7 +162,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_api_requests_overview_info.py b/plugins/modules/organizations_api_requests_overview_info.py
index a912371be..d6ef15400 100644
--- a/plugins/modules/organizations_api_requests_overview_info.py
+++ b/plugins/modules/organizations_api_requests_overview_info.py
@@ -5,83 +5,82 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_api_requests_overview_info
-short_description: Information module for organizations _api _requests _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _api _requests _overview.
-- Return an aggregated overview of API requests data.
-version_added: '2.16.0'
+  - Get all organizations _api _requests _overview.
+  - Return an aggregated overview of API requests data.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_api_requests_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_api_requests_overview,
+  - Paths used are get /organizations/{organizationId}/apiRequests/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 31 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 31 days.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationApiRequestsOverview
-  description: Complete reference of the getOrganizationApiRequestsOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_api_requests_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/apiRequests/overview,
+  - description: Complete reference of the getOrganizationApiRequestsOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests-overview
+    name: Cisco Meraki documentation for organizations getOrganizationApiRequestsOverview
+short_description: Information module for organizations _api _requests _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _api _requests _overview
   cisco.meraki.organizations_api_requests_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_api_requests_overview_response_codes_by_interval_info.py b/plugins/modules/organizations_api_requests_overview_response_codes_by_interval_info.py
index b70d339ad..02375715e 100644
--- a/plugins/modules/organizations_api_requests_overview_response_codes_by_interval_info.py
+++ b/plugins/modules/organizations_api_requests_overview_response_codes_by_interval_info.py
@@ -5,108 +5,114 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_api_requests_overview_response_codes_by_interval_info
-short_description: Information module for organizations _api _requests _overview _response _codes _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _api _requests _overview _response _codes _by _interval.
-- Tracks organizations' API requests by response code across a given time period.
-version_added: '2.16.0'
+  - Get all organizations _api _requests _overview _response _codes _by _interval.
+  - Tracks organizations' API requests by response code across a given time period.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_api_requests_overview_response_codes_by_interval_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_api_requests_overview_response_codes_by_interval,
+  - Paths used are get /organizations/{organizationId}/apiRequests/overview/responseCodes/byInterval,
 options:
+  adminIds:
+    description:
+      - AdminIds query parameter. Filter by admin ID of user that made the API request.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
+  interval:
+    description:
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 120, 3600, 14400, 21600. The default is 21600. Interval
+        is calculated if time params are provided.
+
+        '
+    type: int
+  operationIds:
+    description:
+      - OperationIds query parameter. Filter by operation ID of the endpoint.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  sourceIps:
+    description:
+      - SourceIps query parameter. Filter by source IP that made the API request.
+    elements: str
+    type: list
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 31 days. If interval is provided, the timespan will be autocalculated.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 31 days. If interval is provided, the timespan will be autocalculated.
+
+        '
     type: float
-  interval:
+  userAgent:
     description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 120, 3600,
-      14400, 21600. The default is 21600. Interval is calculated if time params are provided.
-    type: int
+      - 'UserAgent query parameter. Filter by user agent string for API request. This
+        will filter by a complete or partial match.
+
+        '
+    type: str
   version:
     description:
-    - Version query parameter. Filter by API version of the endpoint. Allowable values are 0, 1.
+      - Version query parameter. Filter by API version of the endpoint. Allowable
+        values are 0, 1.
     type: int
-  operationIds:
-    description:
-    - OperationIds query parameter. Filter by operation ID of the endpoint.
-    elements: str
-    type: list
-  sourceIps:
-    description:
-    - SourceIps query parameter. Filter by source IP that made the API request.
-    elements: str
-    type: list
-  adminIds:
-    description:
-    - AdminIds query parameter. Filter by admin ID of user that made the API request.
-    elements: str
-    type: list
-  userAgent:
-    description:
-    - >
-      UserAgent query parameter. Filter by user agent string for API request. This will filter by a complete or
-      partial match.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationApiRequestsOverviewResponseCodesByInterval
-  description: Complete reference of the getOrganizationApiRequestsOverviewResponseCodesByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests-overview-response-codes-by-interval
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_api_requests_overview_response_codes_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/apiRequests/overview/responseCodes/byInterval,
+  - description: Complete reference of the getOrganizationApiRequestsOverviewResponseCodesByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-api-requests-overview-response-codes-by-interval
+    name: Cisco Meraki documentation for organizations getOrganizationApiRequestsOverviewResponseCodesByInterval
+short_description: Information module for organizations _api _requests _overview _response
+  _codes _by _interval
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _api _requests _overview _response _codes _by _interval
   cisco.meraki.organizations_api_requests_overview_response_codes_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -118,7 +124,6 @@
     userAgent: string
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_security_intrusion.py b/plugins/modules/organizations_appliance_security_intrusion.py
index 9725dafa3..eb6e6f6b7 100644
--- a/plugins/modules/organizations_appliance_security_intrusion.py
+++ b/plugins/modules/organizations_appliance_security_intrusion.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_security_intrusion
-short_description: Resource module for organizations _appliance _security _intrusion
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _appliance _security _intrusion.
-- Sets supported intrusion settings for an organization.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _appliance _security _intrusion.
+  - Sets supported intrusion settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_security_intrusion
+notes:
+  - SDK Method used are appliance.Appliance.update_organization_appliance_security_intrusion,
+  - Paths used are put /organizations/{organizationId}/appliance/security/intrusion,
 options:
   allowedRules:
     description: Sets a list of specific SNORT signatures to allow.
@@ -26,59 +26,56 @@
         type: str
       ruleId:
         description: A rule identifier of the format meraki intrusion/snort/GID/<gid>/SID/<sid>.
-          Gid and sid can be obtained from either https //www.snort.org/rule-docs or
-          as ruleIds from the security events in /organization/orgId/securityEvents.
+          Gid and sid can be obtained from either https //www.snort.org/rule-docs
+          or as ruleIds from the security events in /organization/orgId/securityEvents.
         type: str
     type: list
   organizationId:
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateOrganizationApplianceSecurityIntrusion
-  description: Complete reference of the updateOrganizationApplianceSecurityIntrusion API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-security-intrusion
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_organization_appliance_security_intrusion,
-
-  - Paths used are
-    put /organizations/{organizationId}/appliance/security/intrusion,
+  - description: Complete reference of the updateOrganizationApplianceSecurityIntrusion
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-security-intrusion
+    name: Cisco Meraki documentation for appliance updateOrganizationApplianceSecurityIntrusion
+short_description: Resource module for organizations _appliance _security _intrusion
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_appliance_security_intrusion:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     allowedRules:
-    - message: SQL sa login failed
-      ruleId: meraki:intrusion/snort/GID/01/SID/688
-    - message: MALWARE-OTHER Trackware myway speedbar runtime detection - switch engines
-      ruleId: meraki:intrusion/snort/GID/01/SID/5805
+      - message: SQL sa login failed
+        ruleId: meraki:intrusion/snort/GID/01/SID/688
+      - message: MALWARE-OTHER Trackware myway speedbar runtime detection - switch
+          engines
+        ruleId: meraki:intrusion/snort/GID/01/SID/5805
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_security_intrusion_info.py b/plugins/modules/organizations_appliance_security_intrusion_info.py
index 369f406ab..0c1be5479 100644
--- a/plugins/modules/organizations_appliance_security_intrusion_info.py
+++ b/plugins/modules/organizations_appliance_security_intrusion_info.py
@@ -5,65 +5,61 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_security_intrusion_info
-short_description: Information module for organizations _appliance _security _intrusion
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _security _intrusion.
-- Returns all supported intrusion settings for an organization.
-version_added: '2.16.0'
+  - Get all organizations _appliance _security _intrusion.
+  - Returns all supported intrusion settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_security_intrusion_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_security_intrusion,
+  - Paths used are get /organizations/{organizationId}/appliance/security/intrusion,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceSecurityIntrusion
-  description: Complete reference of the getOrganizationApplianceSecurityIntrusion API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-security-intrusion
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_security_intrusion,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/security/intrusion,
+  - description: Complete reference of the getOrganizationApplianceSecurityIntrusion
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-security-intrusion
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceSecurityIntrusion
+short_description: Information module for organizations _appliance _security _intrusion
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _security _intrusion
   cisco.meraki.organizations_appliance_security_intrusion_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info.py b/plugins/modules/organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info.py
index 945c00931..43a9b0c16 100644
--- a/plugins/modules/organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info.py
+++ b/plugins/modules/organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info.py
@@ -5,86 +5,92 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info
-short_description: Information module for organizations _appliance _traffic _shaping _vpn _exclusions _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _traffic _shaping _vpn _exclusions _by _network.
-- Display VPN exclusion rules for MX networks.
-version_added: '2.16.0'
+  - Get all organizations _appliance _traffic _shaping _vpn _exclusions _by _network.
+  - Display VPN exclusion rules for MX networks.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_traffic_shaping_vpn_exclusions_by_network,
+  - Paths used are get /organizations/{organizationId}/appliance/trafficShaping/vpnExclusions/byNetwork,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter the results by network
+        IDs.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter the results by network IDs.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceTrafficShapingVpnExclusionsByNetwork
-  description: Complete reference of the getOrganizationApplianceTrafficShapingVpnExclusionsByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-traffic-shaping-vpn-exclusions-by-network
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_traffic_shaping_vpn_exclusions_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/trafficShaping/vpnExclusions/byNetwork,
+  - description: Complete reference of the getOrganizationApplianceTrafficShapingVpnExclusionsByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-traffic-shaping-vpn-exclusions-by-network
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceTrafficShapingVpnExclusionsByNetwork
+short_description: Information module for organizations _appliance _traffic _shaping
+  _vpn _exclusions _by _network
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _traffic _shaping _vpn _exclusions _by _network
   cisco.meraki.organizations_appliance_traffic_shaping_vpn_exclusions_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -93,7 +99,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_uplinks_statuses_overview_info.py b/plugins/modules/organizations_appliance_uplinks_statuses_overview_info.py
index 639635486..731a1af9d 100644
--- a/plugins/modules/organizations_appliance_uplinks_statuses_overview_info.py
+++ b/plugins/modules/organizations_appliance_uplinks_statuses_overview_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_uplinks_statuses_overview_info
-short_description: Information module for organizations _appliance _uplinks _statuses _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _uplinks _statuses _overview.
-- Returns an overview of uplink statuses.
-version_added: '2.16.0'
+  - Get all organizations _appliance _uplinks _statuses _overview.
+  - Returns an overview of uplink statuses.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_uplinks_statuses_overview_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_uplinks_statuses_overview,
+  - Paths used are get /organizations/{organizationId}/appliance/uplinks/statuses/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceUplinksStatusesOverview
-  description: Complete reference of the getOrganizationApplianceUplinksStatusesOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-uplinks-statuses-overview
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_uplinks_statuses_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/uplinks/statuses/overview,
+  - description: Complete reference of the getOrganizationApplianceUplinksStatusesOverview
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-uplinks-statuses-overview
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceUplinksStatusesOverview
+short_description: Information module for organizations _appliance _uplinks _statuses
+  _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _uplinks _statuses _overview
   cisco.meraki.organizations_appliance_uplinks_statuses_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_uplinks_usage_by_network_info.py b/plugins/modules/organizations_appliance_uplinks_usage_by_network_info.py
index b71a5e115..5c427bcae 100644
--- a/plugins/modules/organizations_appliance_uplinks_usage_by_network_info.py
+++ b/plugins/modules/organizations_appliance_uplinks_usage_by_network_info.py
@@ -5,85 +5,88 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_uplinks_usage_by_network_info
-short_description: Information module for organizations _appliance _uplinks _usage _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _uplinks _usage _by _network.
-- >
-   Get the sent and received bytes for each uplink of all MX and Z networks within an organization. If more than one
-   device was active during the specified timespan, then the sent and received bytes will be aggregated by interface.
-version_added: '2.16.0'
+  - Get all organizations _appliance _uplinks _usage _by _network.
+  - 'Get the sent and received bytes for each uplink of all MX and Z networks within
+    an organization. If more than one device was active during the specified timespan,
+    then the sent and received bytes will be aggregated by interface.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_uplinks_usage_by_network_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_uplinks_usage_by_network,
+  - Paths used are get /organizations/{organizationId}/appliance/uplinks/usage/byNetwork,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 365 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 365 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 14 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 14 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 14 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 14 days. The default
+        is 1 day.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceUplinksUsageByNetwork
-  description: Complete reference of the getOrganizationApplianceUplinksUsageByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-uplinks-usage-by-network
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_uplinks_usage_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/uplinks/usage/byNetwork,
+  - description: Complete reference of the getOrganizationApplianceUplinksUsageByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-uplinks-usage-by-network
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceUplinksUsageByNetwork
+short_description: Information module for organizations _appliance _uplinks _usage
+  _by _network
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _uplinks _usage _by _network
   cisco.meraki.organizations_appliance_uplinks_usage_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers.py b/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers.py
index f1088e208..bd947ddb7 100644
--- a/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers.py
+++ b/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_vpn_third_party_vpnpeers
-short_description: Resource module for organizations _appliance _vpn _third _party _vpnpeers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _appliance _vpn _third _party _vpnpeers.
-- Update the third party VPN peers for an organization.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _appliance _vpn _third _party
+    _vpnpeers.
+  - Update the third party VPN peers for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_vpn_third_party_vpnpeers
+notes:
+  - SDK Method used are appliance.Appliance.update_organization_appliance_vpn_third_party_vpnpeers,
+  - Paths used are put /organizations/{organizationId}/appliance/vpn/thirdPartyVPNPeers,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -28,19 +29,20 @@
           Defaults to '1' when omitted.
         type: str
       ipsecPolicies:
-        description: Custom IPSec policies for the VPN peer. If not included and a preset
-          has not been chosen, the default preset for IPSec policies will be used.
+        description: Custom IPSec policies for the VPN peer. If not included and a
+          preset has not been chosen, the default preset for IPSec policies will be
+          used.
         suboptions:
           childAuthAlgo:
-            description: This is the authentication algorithms to be used in Phase 2.
-              The value should be an array with one of the following algorithms 'sha256',
-              'sha1', 'md5'.
+            description: This is the authentication algorithms to be used in Phase
+              2. The value should be an array with one of the following algorithms
+              'sha256', 'sha1', 'md5'.
             elements: str
             type: list
           childCipherAlgo:
-            description: This is the cipher algorithms to be used in Phase 2. The value
-              should be an array with one or more of the following algorithms 'aes256',
-              'aes192', 'aes128', 'tripledes', 'des', 'null'.
+            description: This is the cipher algorithms to be used in Phase 2. The
+              value should be an array with one or more of the following algorithms
+              'aes256', 'aes192', 'aes128', 'tripledes', 'des', 'null'.
             elements: str
             type: list
           childLifetime:
@@ -53,9 +55,9 @@
             elements: str
             type: list
           ikeAuthAlgo:
-            description: This is the authentication algorithm to be used in Phase 1.
-              The value should be an array with one of the following algorithms 'sha256',
-              'sha1', 'md5'.
+            description: This is the authentication algorithm to be used in Phase
+              1. The value should be an array with one of the following algorithms
+              'sha256', 'sha1', 'md5'.
             elements: str
             type: list
           ikeCipherAlgo:
@@ -74,10 +76,10 @@
             description: The lifetime of the Phase 1 SA in seconds.
             type: int
           ikePrfAlgo:
-            description: Optional This is the pseudo-random function to be used in IKE_SA.
-              The value should be an array with one of the following algorithms 'prfsha256',
-              'prfsha1', 'prfmd5', 'default'. The 'default' option can be used to default
-              to the Authentication algorithm.
+            description: Optional This is the pseudo-random function to be used in
+              IKE_SA. The value should be an array with one of the following algorithms
+              'prfsha256', 'prfsha1', 'prfmd5', 'default'. The 'default' option can
+              be used to default to the Authentication algorithm.
             elements: str
             type: list
         type: dict
@@ -87,16 +89,16 @@
           is ignored.
         type: str
       localId:
-        description: Optional The local ID is used to identify the MX to the peer. This
-          will apply to all MXs this peer applies to.
+        description: Optional The local ID is used to identify the MX to the peer.
+          This will apply to all MXs this peer applies to.
         type: str
       name:
         description: The name of the VPN peer.
         type: str
       networkTags:
-        description: A list of network tags that will connect with this peer. Use 'all'
-          for all networks. Use 'none' for no networks. If not included, the default
-          is 'all'.
+        description: A list of network tags that will connect with this peer. Use
+          'all' for all networks. Use 'none' for no networks. If not included, the
+          default is 'all'.
         elements: str
         type: list
       privateSubnets:
@@ -110,85 +112,82 @@
         description: Optional The public IP of the VPN peer.
         type: str
       remoteId:
-        description: Optional The remote ID is used to identify the connecting VPN peer.
-          This can either be a valid IPv4 Address, FQDN or User FQDN.
+        description: Optional The remote ID is used to identify the connecting VPN
+          peer. This can either be a valid IPv4 Address, FQDN or User FQDN.
         type: str
       secret:
         description: The shared secret with the VPN peer.
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateOrganizationApplianceVpnThirdPartyVPNPeers
-  description: Complete reference of the updateOrganizationApplianceVpnThirdPartyVPNPeers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-vpn-third-party-vpn-peers
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_organization_appliance_vpn_third_party_vpnpeers,
-
-  - Paths used are
-    put /organizations/{organizationId}/appliance/vpn/thirdPartyVPNPeers,
+  - description: Complete reference of the updateOrganizationApplianceVpnThirdPartyVPNPeers
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-vpn-third-party-vpn-peers
+    name: Cisco Meraki documentation for appliance updateOrganizationApplianceVpnThirdPartyVPNPeers
+short_description: Resource module for organizations _appliance _vpn _third _party
+  _vpnpeers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_appliance_vpn_third_party_vpnpeers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     organizationId: string
     peers:
-    - ikeVersion: '2'
-      ipsecPolicies:
-        childAuthAlgo:
-        - sha1
-        childCipherAlgo:
-        - aes128
-        childLifetime: 28800
-        childPfsGroup:
-        - disabled
-        ikeAuthAlgo:
-        - sha1
-        ikeCipherAlgo:
-        - tripledes
-        ikeDiffieHellmanGroup:
-        - group2
-        ikeLifetime: 28800
-        ikePrfAlgo:
-        - prfsha1
-      ipsecPoliciesPreset: default
-      localId: myMXId@meraki.com
-      name: Peer Name
-      networkTags:
-      - none
-      privateSubnets:
-      - 192.168.1.0/24
-      - 192.168.128.0/24
-      publicHostname: example.com
-      publicIp: 123.123.123.1
-      remoteId: miles@meraki.com
-      secret: Sample Password
-
+      - ikeVersion: '2'
+        ipsecPolicies:
+          childAuthAlgo:
+            - sha1
+          childCipherAlgo:
+            - aes128
+          childLifetime: 28800
+          childPfsGroup:
+            - disabled
+          ikeAuthAlgo:
+            - sha1
+          ikeCipherAlgo:
+            - tripledes
+          ikeDiffieHellmanGroup:
+            - group2
+          ikeLifetime: 28800
+          ikePrfAlgo:
+            - prfsha1
+        ipsecPoliciesPreset: default
+        localId: myMXId@meraki.com
+        name: Peer Name
+        networkTags:
+          - none
+        privateSubnets:
+          - 192.168.1.0/24
+          - 192.168.128.0/24
+        publicHostname: example.com
+        publicIp: 123.123.123.1
+        remoteId: miles@meraki.com
+        secret: Sample Password
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers_info.py b/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers_info.py
index 49d664326..93b5b5c36 100644
--- a/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers_info.py
+++ b/plugins/modules/organizations_appliance_vpn_third_party_vpnpeers_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_vpn_third_party_vpnpeers_info
-short_description: Information module for organizations _appliance _vpn _third _party _vpnpeers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _vpn _third _party _vpnpeers.
-- Return the third party VPN peers for an organization.
-version_added: '2.16.0'
+  - Get all organizations _appliance _vpn _third _party _vpnpeers.
+  - Return the third party VPN peers for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_vpn_third_party_vpnpeers_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_vpn_third_party_vpnpeers,
+  - Paths used are get /organizations/{organizationId}/appliance/vpn/thirdPartyVPNPeers,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceVpnThirdPartyVPNPeers
-  description: Complete reference of the getOrganizationApplianceVpnThirdPartyVPNPeers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-vpn-third-party-vpn-peers
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_vpn_third_party_vpnpeers,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/vpn/thirdPartyVPNPeers,
+  - description: Complete reference of the getOrganizationApplianceVpnThirdPartyVPNPeers
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-vpn-third-party-vpn-peers
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceVpnThirdPartyVPNPeers
+short_description: Information module for organizations _appliance _vpn _third _party
+  _vpnpeers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _vpn _third _party _vpnpeers
   cisco.meraki.organizations_appliance_vpn_third_party_vpnpeers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules.py b/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules.py
index 2fb3ece0a..449cd31e0 100644
--- a/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules.py
+++ b/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules.py
@@ -5,30 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_vpn_vpn_firewall_rules
-short_description: Resource module for organizations _appliance _vpn _vpn _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _appliance _vpn _vpn _firewall _rules.
-- Update the firewall rules of an organization's site-to-site VPN.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _appliance _vpn _vpn _firewall
+    _rules.
+  - Update the firewall rules of an organization's site-to-site VPN.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_vpn_vpn_firewall_rules
+notes:
+  - SDK Method used are appliance.Appliance.update_organization_appliance_vpn_vpn_firewall_rules,
+  - Paths used are put /organizations/{organizationId}/appliance/vpn/vpnFirewallRules,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
     type: str
   rules:
-    description: An ordered array of the firewall rules (not including the default rule).
+    description: An ordered array of the firewall rules (not including the default
+      rule).
     elements: dict
     suboptions:
       comment:
         description: Description of the rule (optional).
         type: str
       destCidr:
-        description: Comma-separated list of destination IP address(es) (in IP or CIDR
-          notation) or 'any' (FQDN not supported).
+        description: Comma-separated list of destination IP address(es) (in IP or
+          CIDR notation) or 'any' (FQDN not supported).
         type: str
       destPort:
         description: Comma-separated list of destination port(s) (integer in the range
@@ -42,16 +44,16 @@
           'any').
         type: str
       srcCidr:
-        description: Comma-separated list of source IP address(es) (in IP or CIDR notation),
-          or 'any' (FQDN not supported).
+        description: Comma-separated list of source IP address(es) (in IP or CIDR
+          notation), or 'any' (FQDN not supported).
         type: str
       srcPort:
-        description: Comma-separated list of source port(s) (integer in the range 1-65535),
-          or 'any'.
+        description: Comma-separated list of source port(s) (integer in the range
+          1-65535), or 'any'.
         type: str
       syslogEnabled:
-        description: Log this rule to syslog (true or false, boolean value) - only applicable
-          if a syslog has been configured (optional).
+        description: Log this rule to syslog (true or false, boolean value) - only
+          applicable if a syslog has been configured (optional).
         type: bool
     type: list
   syslogDefaultRule:
@@ -59,56 +61,53 @@
       configured a syslog server) (optional).
     type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance updateOrganizationApplianceVpnVpnFirewallRules
-  description: Complete reference of the updateOrganizationApplianceVpnVpnFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-vpn-vpn-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.update_organization_appliance_vpn_vpn_firewall_rules,
-
-  - Paths used are
-    put /organizations/{organizationId}/appliance/vpn/vpnFirewallRules,
+  - description: Complete reference of the updateOrganizationApplianceVpnVpnFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-appliance-vpn-vpn-firewall-rules
+    name: Cisco Meraki documentation for appliance updateOrganizationApplianceVpnVpnFirewallRules
+short_description: Resource module for organizations _appliance _vpn _vpn _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_appliance_vpn_vpn_firewall_rules:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     organizationId: string
     rules:
-    - comment: Allow TCP traffic to subnet with HTTP servers.
-      destCidr: 192.168.1.0/24
-      destPort: '443'
-      policy: allow
-      protocol: tcp
-      srcCidr: Any
-      srcPort: Any
-      syslogEnabled: false
+      - comment: Allow TCP traffic to subnet with HTTP servers.
+        destCidr: 192.168.1.0/24
+        destPort: '443'
+        policy: allow
+        protocol: tcp
+        srcCidr: Any
+        srcPort: Any
+        syslogEnabled: false
     syslogDefaultRule: false
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules_info.py b/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules_info.py
index 671f396fb..fb30160ce 100644
--- a/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules_info.py
+++ b/plugins/modules/organizations_appliance_vpn_vpn_firewall_rules_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_appliance_vpn_vpn_firewall_rules_info
-short_description: Information module for organizations _appliance _vpn _vpn _firewall _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _appliance _vpn _vpn _firewall _rules.
-- Return the firewall rules for an organization's site-to-site VPN.
-version_added: '2.16.0'
+  - Get all organizations _appliance _vpn _vpn _firewall _rules.
+  - Return the firewall rules for an organization's site-to-site VPN.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_appliance_vpn_vpn_firewall_rules_info
+notes:
+  - SDK Method used are appliance.Appliance.get_organization_appliance_vpn_vpn_firewall_rules,
+  - Paths used are get /organizations/{organizationId}/appliance/vpn/vpnFirewallRules,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for appliance getOrganizationApplianceVpnVpnFirewallRules
-  description: Complete reference of the getOrganizationApplianceVpnVpnFirewallRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-vpn-vpn-firewall-rules
-notes:
-  - SDK Method used are
-    appliance.Appliance.get_organization_appliance_vpn_vpn_firewall_rules,
-
-  - Paths used are
-    get /organizations/{organizationId}/appliance/vpn/vpnFirewallRules,
+  - description: Complete reference of the getOrganizationApplianceVpnVpnFirewallRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-appliance-vpn-vpn-firewall-rules
+    name: Cisco Meraki documentation for appliance getOrganizationApplianceVpnVpnFirewallRules
+short_description: Information module for organizations _appliance _vpn _vpn _firewall
+  _rules
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _appliance _vpn _vpn _firewall _rules
   cisco.meraki.organizations_appliance_vpn_vpn_firewall_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assets.py b/plugins/modules/organizations_assets.py
index 175743ce7..a81a0bc77 100644
--- a/plugins/modules/organizations_assets.py
+++ b/plugins/modules/organizations_assets.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assets
-short_description: Resource module for organizations _assets
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _assets.
-- Create a Splash Theme Asset.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _assets.
+  - Create a Splash Theme Asset.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_assets
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_splash_theme_asset,
+  - Paths used are post /organizations/{organizationId}/splash/themes/{themeIdentifier}/assets,
 options:
   content:
     description: A file containing the asset content.
@@ -29,48 +29,43 @@
     description: ThemeIdentifier path parameter. Theme identifier.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationSplashThemeAsset
-  description: Complete reference of the createOrganizationSplashThemeAsset API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-splash-theme-asset
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_splash_theme_asset,
-
-  - Paths used are
-    post /organizations/{organizationId}/splash/themes/{themeIdentifier}/assets,
+  - description: Complete reference of the createOrganizationSplashThemeAsset API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-splash-theme-asset
+    name: Cisco Meraki documentation for organizations createOrganizationSplashThemeAsset
+short_description: Resource module for organizations _assets
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_assets:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     content: string
     name: string
     organizationId: string
     themeIdentifier: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_dismiss.py b/plugins/modules/organizations_assurance_alerts_dismiss.py
index e6cecbb39..8b231f292 100644
--- a/plugins/modules/organizations_assurance_alerts_dismiss.py
+++ b/plugins/modules/organizations_assurance_alerts_dismiss.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_dismiss
-short_description: Resource module for organizations _assurance _alerts _dismiss
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _assurance _alerts _dismiss.
-- Dismiss health alerts.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _assurance _alerts _dismiss.
+  - Dismiss health alerts.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_dismiss
+notes:
+  - SDK Method used are organizations.Organizations.dismiss_organization_assurance_alerts,
+  - Paths used are post /organizations/{organizationId}/assurance/alerts/dismiss,
 options:
   alertIds:
     description: Array of alert IDs to dismiss.
@@ -24,48 +24,43 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations dismissOrganizationAssuranceAlerts
-  description: Complete reference of the dismissOrganizationAssuranceAlerts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!dismiss-organization-assurance-alerts
-notes:
-  - SDK Method used are
-    organizations.Organizations.dismiss_organization_assurance_alerts,
-
-  - Paths used are
-    post /organizations/{organizationId}/assurance/alerts/dismiss,
+  - description: Complete reference of the dismissOrganizationAssuranceAlerts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!dismiss-organization-assurance-alerts
+    name: Cisco Meraki documentation for organizations dismissOrganizationAssuranceAlerts
+short_description: Resource module for organizations _assurance _alerts _dismiss
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_assurance_alerts_dismiss:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     alertIds:
-    - '1234'
-    - '4567'
+      - '1234'
+      - '4567'
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_info.py b/plugins/modules/organizations_assurance_alerts_info.py
index b70fee4dd..18d028c4a 100644
--- a/plugins/modules/organizations_assurance_alerts_info.py
+++ b/plugins/modules/organizations_assurance_alerts_info.py
@@ -5,151 +5,161 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_info
-short_description: Information module for organizations _assurance _alerts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _assurance _alerts.
-- Return all health alerts for an organization.
-version_added: '2.20.0'
+  - Get all organizations _assurance _alerts.
+  - Return all health alerts for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_assurance_alerts,
+  - Paths used are get /organizations/{organizationId}/assurance/alerts,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
+  active:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - Active query parameter. Optional parameter to filter by active alerts defaults
+        to true.
+    type: bool
+  category:
+    description:
+      - Category query parameter. Optional parameter to filter by category.
     type: str
-  perPage:
+  deviceTags:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 4 - 300. Default is 30.
-    type: int
-  startingAfter:
+      - DeviceTags query parameter. Optional parameter to filter by device tags.
+    elements: str
+    type: list
+  deviceTypes:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - DeviceTypes query parameter. Optional parameter to filter by device types.
+    elements: str
+    type: list
+  dismissed:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  sortOrder:
+      - Dismissed query parameter. Optional parameter to filter by dismissed alerts
+        defaults to false.
+    type: bool
+  endingBefore:
     description:
-    - >
-      SortOrder query parameter. Sorted order of entries. Order options are 'ascending' and 'descending'. Default
-      is 'ascending'.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   networkId:
     description:
-    - NetworkId query parameter. Optional parameter to filter alerts by network ids.
+      - NetworkId query parameter. Optional parameter to filter alerts by network
+        ids.
     type: str
-  severity:
+  organizationId:
     description:
-    - Severity query parameter. Optional parameter to filter by severity type.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  types:
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 4 - 300. Default is 30.
+    type: int
+  resolved:
+    description:
+      - Resolved query parameter. Optional parameter to filter by resolved alerts
+        defaults to false.
+    type: bool
+  serials:
     description:
-    - Types query parameter. Optional parameter to filter by alert type.
+      - Serials query parameter. Optional parameter to filter by primary device serial.
     elements: str
     type: list
-  tsStart:
+  severity:
     description:
-    - TsStart query parameter. Optional parameter to filter by starting timestamp.
+      - Severity query parameter. Optional parameter to filter by severity type.
     type: str
-  tsEnd:
+  sortBy:
     description:
-    - TsEnd query parameter. Optional parameter to filter by end timestamp.
+      - SortBy query parameter. Optional parameter to set column to sort by.
     type: str
-  category:
+  sortOrder:
     description:
-    - Category query parameter. Optional parameter to filter by category.
+      - 'SortOrder query parameter. Sorted order of entries. Order options are ''ascending''
+        and ''descending''. Default is ''ascending''.
+
+        '
     type: str
-  sortBy:
+  startingAfter:
     description:
-    - SortBy query parameter. Optional parameter to set column to sort by.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter by primary device serial.
-    elements: str
-    type: list
-  deviceTypes:
-    description:
-    - DeviceTypes query parameter. Optional parameter to filter by device types.
-    elements: str
-    type: list
-  deviceTags:
-    description:
-    - DeviceTags query parameter. Optional parameter to filter by device tags.
-    elements: str
-    type: list
-  active:
+  suppressAlertsForOfflineNodes:
     description:
-    - Active query parameter. Optional parameter to filter by active alerts defaults to true.
+      - 'SuppressAlertsForOfflineNodes query parameter. When set to true the api will
+        only return connectivity alerts for a given device if that device is in an
+        offline state. This only applies to devices. This is ignored when resolved
+        is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only
+        the Unreachable alert will be returned. Defaults to false.
+
+        '
     type: bool
-  dismissed:
+  tsEnd:
     description:
-    - Dismissed query parameter. Optional parameter to filter by dismissed alerts defaults to false.
-    type: bool
-  resolved:
+      - TsEnd query parameter. Optional parameter to filter by end timestamp.
+    type: str
+  tsStart:
     description:
-    - Resolved query parameter. Optional parameter to filter by resolved alerts defaults to false.
-    type: bool
-  suppressAlertsForOfflineNodes:
+      - TsStart query parameter. Optional parameter to filter by starting timestamp.
+    type: str
+  types:
     description:
-    - >
-      SuppressAlertsForOfflineNodes query parameter. When set to true the api will only return connectivity alerts
-      for a given device if that device is in an offline state. This only applies to devices. This is ignored when
-      resolved is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only the Unreachable alert
-      will be returned. Defaults to false.
-    type: bool
+      - Types query parameter. Optional parameter to filter by alert type.
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlerts
-  description: Complete reference of the getOrganizationAssuranceAlerts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_assurance_alerts,
-
-  - Paths used are
-    get /organizations/{organizationId}/assurance/alerts,
+  - description: Complete reference of the getOrganizationAssuranceAlerts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts
+    name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlerts
+short_description: Information module for organizations _assurance _alerts
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _assurance _alerts
   cisco.meraki.organizations_assurance_alerts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -164,15 +174,14 @@
     serials: []
     deviceTypes: []
     deviceTags: []
-    active: True
-    dismissed: True
-    resolved: True
-    suppressAlertsForOfflineNodes: True
+    active: true
+    dismissed: true
+    resolved: true
+    suppressAlertsForOfflineNodes: true
     organizationId: string
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_overview_by_network_info.py b/plugins/modules/organizations_assurance_alerts_overview_by_network_info.py
index 52d3bd2eb..5f88f377a 100644
--- a/plugins/modules/organizations_assurance_alerts_overview_by_network_info.py
+++ b/plugins/modules/organizations_assurance_alerts_overview_by_network_info.py
@@ -5,147 +5,160 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_overview_by_network_info
-short_description: Information module for organizations _assurance _alerts _overview _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _assurance _alerts _overview _by _network.
-- Return a Summary of Alerts grouped by network and severity.
-version_added: '2.20.0'
+  - Get all organizations _assurance _alerts _overview _by _network.
+  - Return a Summary of Alerts grouped by network and severity.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_overview_by_network_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_assurance_alerts_overview_by_network,
+  - Paths used are get /organizations/{organizationId}/assurance/alerts/overview/byNetwork,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
+  active:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - Active query parameter. Optional parameter to filter by active alerts defaults
+        to true.
+    type: bool
+  category:
+    description:
+      - Category query parameter. Optional parameter to filter by category.
     type: str
-  perPage:
+  deviceTags:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
+      - DeviceTags query parameter. Optional parameter to filter by device tags.
+    elements: str
+    type: list
+  deviceTypes:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - DeviceTypes query parameter. Optional parameter to filter by device types.
+    elements: str
+    type: list
+  dismissed:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  sortOrder:
+      - Dismissed query parameter. Optional parameter to filter by dismissed alerts
+        defaults to false.
+    type: bool
+  endingBefore:
     description:
-    - >
-      SortOrder query parameter. Sorted order of entries. Order options are 'ascending' and 'descending'. Default
-      is 'ascending'.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   networkId:
     description:
-    - NetworkId query parameter. Optional parameter to filter alerts overview by network id.
+      - NetworkId query parameter. Optional parameter to filter alerts overview by
+        network id.
     type: str
-  severity:
+  organizationId:
     description:
-    - Severity query parameter. Optional parameter to filter alerts overview by severity type.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  types:
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  resolved:
+    description:
+      - Resolved query parameter. Optional parameter to filter by resolved alerts
+        defaults to false.
+    type: bool
+  serials:
     description:
-    - Types query parameter. Optional parameter to filter by alert type.
+      - Serials query parameter. Optional parameter to filter by primary device serial.
     elements: str
     type: list
-  tsStart:
+  severity:
     description:
-    - TsStart query parameter. Optional parameter to filter by starting timestamp.
+      - Severity query parameter. Optional parameter to filter alerts overview by
+        severity type.
     type: str
-  tsEnd:
+  sortOrder:
     description:
-    - TsEnd query parameter. Optional parameter to filter by end timestamp.
+      - 'SortOrder query parameter. Sorted order of entries. Order options are ''ascending''
+        and ''descending''. Default is ''ascending''.
+
+        '
     type: str
-  category:
+  startingAfter:
     description:
-    - Category query parameter. Optional parameter to filter by category.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter by primary device serial.
-    elements: str
-    type: list
-  deviceTypes:
-    description:
-    - DeviceTypes query parameter. Optional parameter to filter by device types.
-    elements: str
-    type: list
-  deviceTags:
-    description:
-    - DeviceTags query parameter. Optional parameter to filter by device tags.
-    elements: str
-    type: list
-  active:
+  suppressAlertsForOfflineNodes:
     description:
-    - Active query parameter. Optional parameter to filter by active alerts defaults to true.
+      - 'SuppressAlertsForOfflineNodes query parameter. When set to true the api will
+        only return connectivity alerts for a given device if that device is in an
+        offline state. This only applies to devices. This is ignored when resolved
+        is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only
+        the Unreachable alert will be returned. Defaults to false.
+
+        '
     type: bool
-  dismissed:
+  tsEnd:
     description:
-    - Dismissed query parameter. Optional parameter to filter by dismissed alerts defaults to false.
-    type: bool
-  resolved:
+      - TsEnd query parameter. Optional parameter to filter by end timestamp.
+    type: str
+  tsStart:
     description:
-    - Resolved query parameter. Optional parameter to filter by resolved alerts defaults to false.
-    type: bool
-  suppressAlertsForOfflineNodes:
+      - TsStart query parameter. Optional parameter to filter by starting timestamp.
+    type: str
+  types:
     description:
-    - >
-      SuppressAlertsForOfflineNodes query parameter. When set to true the api will only return connectivity alerts
-      for a given device if that device is in an offline state. This only applies to devices. This is ignored when
-      resolved is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only the Unreachable alert
-      will be returned. Defaults to false.
-    type: bool
+      - Types query parameter. Optional parameter to filter by alert type.
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewByNetwork
-  description: Complete reference of the getOrganizationAssuranceAlertsOverviewByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-by-network
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_assurance_alerts_overview_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/assurance/alerts/overview/byNetwork,
+  - description: Complete reference of the getOrganizationAssuranceAlertsOverviewByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-by-network
+    name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewByNetwork
+short_description: Information module for organizations _assurance _alerts _overview
+  _by _network
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _assurance _alerts _overview _by _network
   cisco.meraki.organizations_assurance_alerts_overview_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -159,15 +172,14 @@
     serials: []
     deviceTypes: []
     deviceTags: []
-    active: True
-    dismissed: True
-    resolved: True
-    suppressAlertsForOfflineNodes: True
+    active: true
+    dismissed: true
+    resolved: true
+    suppressAlertsForOfflineNodes: true
     organizationId: string
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_overview_by_type_info.py b/plugins/modules/organizations_assurance_alerts_overview_by_type_info.py
index bab43a6b7..fff26dff2 100644
--- a/plugins/modules/organizations_assurance_alerts_overview_by_type_info.py
+++ b/plugins/modules/organizations_assurance_alerts_overview_by_type_info.py
@@ -5,151 +5,164 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_overview_by_type_info
-short_description: Information module for organizations _assurance _alerts _overview _by _type
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _assurance _alerts _overview _by _type.
-- Return a Summary of Alerts grouped by type and severity.
-version_added: '2.20.0'
+  - Get all organizations _assurance _alerts _overview _by _type.
+  - Return a Summary of Alerts grouped by type and severity.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_overview_by_type_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_assurance_alerts_overview_by_type,
+  - Paths used are get /organizations/{organizationId}/assurance/alerts/overview/byType,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
+  active:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - Active query parameter. Optional parameter to filter by active alerts defaults
+        to true.
+    type: bool
+  category:
+    description:
+      - Category query parameter. Optional parameter to filter by category.
     type: str
-  perPage:
+  deviceTags:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
+      - DeviceTags query parameter. Optional parameter to filter by device tags.
+    elements: str
+    type: list
+  deviceTypes:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - DeviceTypes query parameter. Optional parameter to filter by device types.
+    elements: str
+    type: list
+  dismissed:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  sortOrder:
+      - Dismissed query parameter. Optional parameter to filter by dismissed alerts
+        defaults to false.
+    type: bool
+  endingBefore:
     description:
-    - >
-      SortOrder query parameter. Sorted order of entries. Order options are 'ascending' and 'descending'. Default
-      is 'ascending'.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   networkId:
     description:
-    - NetworkId query parameter. Optional parameter to filter alerts overview by network ids.
+      - NetworkId query parameter. Optional parameter to filter alerts overview by
+        network ids.
     type: str
-  severity:
+  organizationId:
     description:
-    - Severity query parameter. Optional parameter to filter alerts overview by severity type.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  types:
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  resolved:
+    description:
+      - Resolved query parameter. Optional parameter to filter by resolved alerts
+        defaults to false.
+    type: bool
+  serials:
     description:
-    - Types query parameter. Optional parameter to filter by alert type.
+      - Serials query parameter. Optional parameter to filter by primary device serial.
     elements: str
     type: list
-  tsStart:
+  severity:
     description:
-    - TsStart query parameter. Optional parameter to filter by starting timestamp.
+      - Severity query parameter. Optional parameter to filter alerts overview by
+        severity type.
     type: str
-  tsEnd:
+  sortBy:
     description:
-    - TsEnd query parameter. Optional parameter to filter by end timestamp.
+      - SortBy query parameter. Optional parameter to set column to sort by.
     type: str
-  category:
+  sortOrder:
     description:
-    - Category query parameter. Optional parameter to filter by category.
+      - 'SortOrder query parameter. Sorted order of entries. Order options are ''ascending''
+        and ''descending''. Default is ''ascending''.
+
+        '
     type: str
-  sortBy:
+  startingAfter:
     description:
-    - SortBy query parameter. Optional parameter to set column to sort by.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter by primary device serial.
-    elements: str
-    type: list
-  deviceTypes:
-    description:
-    - DeviceTypes query parameter. Optional parameter to filter by device types.
-    elements: str
-    type: list
-  deviceTags:
-    description:
-    - DeviceTags query parameter. Optional parameter to filter by device tags.
-    elements: str
-    type: list
-  active:
+  suppressAlertsForOfflineNodes:
     description:
-    - Active query parameter. Optional parameter to filter by active alerts defaults to true.
+      - 'SuppressAlertsForOfflineNodes query parameter. When set to true the api will
+        only return connectivity alerts for a given device if that device is in an
+        offline state. This only applies to devices. This is ignored when resolved
+        is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only
+        the Unreachable alert will be returned. Defaults to false.
+
+        '
     type: bool
-  dismissed:
+  tsEnd:
     description:
-    - Dismissed query parameter. Optional parameter to filter by dismissed alerts defaults to false.
-    type: bool
-  resolved:
+      - TsEnd query parameter. Optional parameter to filter by end timestamp.
+    type: str
+  tsStart:
     description:
-    - Resolved query parameter. Optional parameter to filter by resolved alerts defaults to false.
-    type: bool
-  suppressAlertsForOfflineNodes:
+      - TsStart query parameter. Optional parameter to filter by starting timestamp.
+    type: str
+  types:
     description:
-    - >
-      SuppressAlertsForOfflineNodes query parameter. When set to true the api will only return connectivity alerts
-      for a given device if that device is in an offline state. This only applies to devices. This is ignored when
-      resolved is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only the Unreachable alert
-      will be returned. Defaults to false.
-    type: bool
+      - Types query parameter. Optional parameter to filter by alert type.
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewByType
-  description: Complete reference of the getOrganizationAssuranceAlertsOverviewByType API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-by-type
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_assurance_alerts_overview_by_type,
-
-  - Paths used are
-    get /organizations/{organizationId}/assurance/alerts/overview/byType,
+  - description: Complete reference of the getOrganizationAssuranceAlertsOverviewByType
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-by-type
+    name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewByType
+short_description: Information module for organizations _assurance _alerts _overview
+  _by _type
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _assurance _alerts _overview _by _type
   cisco.meraki.organizations_assurance_alerts_overview_by_type_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -164,15 +177,14 @@
     serials: []
     deviceTypes: []
     deviceTags: []
-    active: True
-    dismissed: True
-    resolved: True
-    suppressAlertsForOfflineNodes: True
+    active: true
+    dismissed: true
+    resolved: true
+    suppressAlertsForOfflineNodes: true
     organizationId: string
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_overview_historical_info.py b/plugins/modules/organizations_assurance_alerts_overview_historical_info.py
index 03616da55..7df6698f5 100644
--- a/plugins/modules/organizations_assurance_alerts_overview_historical_info.py
+++ b/plugins/modules/organizations_assurance_alerts_overview_historical_info.py
@@ -5,101 +5,104 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_overview_historical_info
-short_description: Information module for organizations _assurance _alerts _overview _historical
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _assurance _alerts _overview _historical.
-- Returns historical health alert overviews.
-version_added: '2.20.0'
+  - Get all organizations _assurance _alerts _overview _historical.
+  - Returns historical health alert overviews.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_overview_historical_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_assurance_alerts_overview_historical,
+  - Paths used are get /organizations/{organizationId}/assurance/alerts/overview/historical,
 options:
+  category:
+    description:
+      - Category query parameter. Optional parameter to filter by category.
+    type: str
+  deviceTypes:
+    description:
+      - DeviceTypes query parameter. Optional parameter to filter by device types.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
+  networkId:
+    description:
+      - NetworkId query parameter. Optional parameter to filter alerts overview by
+        network ids.
+    type: str
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   segmentDuration:
     description:
-    - SegmentDuration query parameter. Amount of time in seconds for each segment in the returned dataset.
+      - SegmentDuration query parameter. Amount of time in seconds for each segment
+        in the returned dataset.
     type: int
-  networkId:
-    description:
-    - NetworkId query parameter. Optional parameter to filter alerts overview by network ids.
-    type: str
-  severity:
-    description:
-    - Severity query parameter. Optional parameter to filter alerts overview by severity type.
-    type: str
-  types:
+  serials:
     description:
-    - Types query parameter. Optional parameter to filter by alert type.
+      - Serials query parameter. Optional parameter to filter by primary device serial.
     elements: str
     type: list
-  tsStart:
+  severity:
     description:
-    - TsStart query parameter. Parameter to define starting timestamp of historical totals.
+      - Severity query parameter. Optional parameter to filter alerts overview by
+        severity type.
     type: str
   tsEnd:
     description:
-    - TsEnd query parameter. Optional parameter to filter by end timestamp defaults to the current time.
+      - TsEnd query parameter. Optional parameter to filter by end timestamp defaults
+        to the current time.
     type: str
-  category:
+  tsStart:
     description:
-    - Category query parameter. Optional parameter to filter by category.
+      - TsStart query parameter. Parameter to define starting timestamp of historical
+        totals.
     type: str
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter by primary device serial.
-    elements: str
-    type: list
-  deviceTypes:
+  types:
     description:
-    - DeviceTypes query parameter. Optional parameter to filter by device types.
+      - Types query parameter. Optional parameter to filter by alert type.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewHistorical
-  description: Complete reference of the getOrganizationAssuranceAlertsOverviewHistorical API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-historical
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_assurance_alerts_overview_historical,
-
-  - Paths used are
-    get /organizations/{organizationId}/assurance/alerts/overview/historical,
+  - description: Complete reference of the getOrganizationAssuranceAlertsOverviewHistorical
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview-historical
+    name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverviewHistorical
+short_description: Information module for organizations _assurance _alerts _overview
+  _historical
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _assurance _alerts _overview _historical
   cisco.meraki.organizations_assurance_alerts_overview_historical_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     segmentDuration: 0
     networkId: string
     severity: string
@@ -111,7 +114,6 @@
     deviceTypes: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_overview_info.py b/plugins/modules/organizations_assurance_alerts_overview_info.py
index 2319c3ffd..dae14a1c2 100644
--- a/plugins/modules/organizations_assurance_alerts_overview_info.py
+++ b/plugins/modules/organizations_assurance_alerts_overview_info.py
@@ -5,122 +5,126 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_overview_info
-short_description: Information module for organizations _assurance _alerts _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _assurance _alerts _overview.
-- Return overview of active health alerts for an organization.
-version_added: '2.20.0'
+  - Get all organizations _assurance _alerts _overview.
+  - Return overview of active health alerts for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_assurance_alerts_overview,
+  - Paths used are get /organizations/{organizationId}/assurance/alerts/overview,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
+  active:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  networkId:
+      - Active query parameter. Optional parameter to filter by active alerts defaults
+        to true.
+    type: bool
+  category:
     description:
-    - NetworkId query parameter. Optional parameter to filter alerts overview by network ids.
+      - Category query parameter. Optional parameter to filter by category.
     type: str
-  severity:
+  deviceTags:
     description:
-    - Severity query parameter. Optional parameter to filter alerts overview by severity type.
-    type: str
-  types:
+      - DeviceTags query parameter. Optional parameter to filter by device tags.
+    elements: str
+    type: list
+  deviceTypes:
     description:
-    - Types query parameter. Optional parameter to filter by alert type.
+      - DeviceTypes query parameter. Optional parameter to filter by device types.
     elements: str
     type: list
-  tsStart:
+  dismissed:
     description:
-    - TsStart query parameter. Optional parameter to filter by starting timestamp.
-    type: str
-  tsEnd:
+      - Dismissed query parameter. Optional parameter to filter by dismissed alerts
+        defaults to false.
+    type: bool
+  headers:
+    description: Additional headers.
+    type: dict
+  networkId:
     description:
-    - TsEnd query parameter. Optional parameter to filter by end timestamp.
+      - NetworkId query parameter. Optional parameter to filter alerts overview by
+        network ids.
     type: str
-  category:
+  organizationId:
     description:
-    - Category query parameter. Optional parameter to filter by category.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  serials:
+  resolved:
     description:
-    - Serials query parameter. Optional parameter to filter by primary device serial.
-    elements: str
-    type: list
-  deviceTypes:
+      - Resolved query parameter. Optional parameter to filter by resolved alerts
+        defaults to false.
+    type: bool
+  serials:
     description:
-    - DeviceTypes query parameter. Optional parameter to filter by device types.
+      - Serials query parameter. Optional parameter to filter by primary device serial.
     elements: str
     type: list
-  deviceTags:
+  severity:
     description:
-    - DeviceTags query parameter. Optional parameter to filter by device tags.
-    elements: str
-    type: list
-  active:
+      - Severity query parameter. Optional parameter to filter alerts overview by
+        severity type.
+    type: str
+  suppressAlertsForOfflineNodes:
     description:
-    - Active query parameter. Optional parameter to filter by active alerts defaults to true.
+      - 'SuppressAlertsForOfflineNodes query parameter. When set to true the api will
+        only return connectivity alerts for a given device if that device is in an
+        offline state. This only applies to devices. This is ignored when resolved
+        is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only
+        the Unreachable alert will be returned. Defaults to false.
+
+        '
     type: bool
-  dismissed:
+  tsEnd:
     description:
-    - Dismissed query parameter. Optional parameter to filter by dismissed alerts defaults to false.
-    type: bool
-  resolved:
+      - TsEnd query parameter. Optional parameter to filter by end timestamp.
+    type: str
+  tsStart:
     description:
-    - Resolved query parameter. Optional parameter to filter by resolved alerts defaults to false.
-    type: bool
-  suppressAlertsForOfflineNodes:
+      - TsStart query parameter. Optional parameter to filter by starting timestamp.
+    type: str
+  types:
     description:
-    - >
-      SuppressAlertsForOfflineNodes query parameter. When set to true the api will only return connectivity alerts
-      for a given device if that device is in an offline state. This only applies to devices. This is ignored when
-      resolved is true. Example If a Switch has a VLan Mismatch and is Unreachable. Only the Unreachable alert
-      will be returned. Defaults to false.
-    type: bool
+      - Types query parameter. Optional parameter to filter by alert type.
+    elements: str
+    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverview
-  description: Complete reference of the getOrganizationAssuranceAlertsOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_assurance_alerts_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/assurance/alerts/overview,
+  - description: Complete reference of the getOrganizationAssuranceAlertsOverview
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-assurance-alerts-overview
+    name: Cisco Meraki documentation for organizations getOrganizationAssuranceAlertsOverview
+short_description: Information module for organizations _assurance _alerts _overview
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _assurance _alerts _overview
   cisco.meraki.organizations_assurance_alerts_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkId: string
     severity: string
     types: []
@@ -130,13 +134,12 @@
     serials: []
     deviceTypes: []
     deviceTags: []
-    active: True
-    dismissed: True
-    resolved: True
-    suppressAlertsForOfflineNodes: True
+    active: true
+    dismissed: true
+    resolved: true
+    suppressAlertsForOfflineNodes: true
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_assurance_alerts_restore.py b/plugins/modules/organizations_assurance_alerts_restore.py
index dd5cafb51..f0f19ab49 100644
--- a/plugins/modules/organizations_assurance_alerts_restore.py
+++ b/plugins/modules/organizations_assurance_alerts_restore.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_assurance_alerts_restore
-short_description: Resource module for organizations _assurance _alerts _restore
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _assurance _alerts _restore.
-- Restore health alerts from dismissed.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _assurance _alerts _restore.
+  - Restore health alerts from dismissed.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_assurance_alerts_restore
+notes:
+  - SDK Method used are organizations.Organizations.restore_organization_assurance_alerts,
+  - Paths used are post /organizations/{organizationId}/assurance/alerts/restore,
 options:
   alertIds:
     description: Array of alert IDs to restore.
@@ -24,48 +24,43 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations restoreOrganizationAssuranceAlerts
-  description: Complete reference of the restoreOrganizationAssuranceAlerts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!restore-organization-assurance-alerts
-notes:
-  - SDK Method used are
-    organizations.Organizations.restore_organization_assurance_alerts,
-
-  - Paths used are
-    post /organizations/{organizationId}/assurance/alerts/restore,
+  - description: Complete reference of the restoreOrganizationAssuranceAlerts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!restore-organization-assurance-alerts
+    name: Cisco Meraki documentation for organizations restoreOrganizationAssuranceAlerts
+short_description: Resource module for organizations _assurance _alerts _restore
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_assurance_alerts_restore:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     alertIds:
-    - '1234'
-    - '4567'
+      - '1234'
+      - '4567'
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_branding_policies.py b/plugins/modules/organizations_branding_policies.py
index 7c6636055..f5120b696 100644
--- a/plugins/modules/organizations_branding_policies.py
+++ b/plugins/modules/organizations_branding_policies.py
@@ -5,21 +5,25 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_branding_policies
-short_description: Resource module for organizations _branding _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _branding _policies.
-- Add a new branding policy to an organization.
-- Delete a branding policy.
-- Update a branding policy.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _branding
+    _policies.
+  - Add a new branding policy to an organization.
+  - Delete a branding policy.
+  - Update a branding policy.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_branding_policies
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_branding_policy,
+    organizations.Organizations.delete_organization_branding_policy, organizations.Organizations.update_organization_branding_policy,
+  - Paths used are post /organizations/{organizationId}/brandingPolicies, delete /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
+    put /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
 options:
   adminSettings:
-    description: Settings for describing which kinds of admins this policy applies to.
+    description: Settings for describing which kinds of admins this policy applies
+      to.
     suboptions:
       appliesTo:
         description: Which kinds of admins this policy applies to. Can be one of 'All
@@ -31,8 +35,8 @@
         description: If 'appliesTo' is set to one of 'Specific admins...', 'All admins
           of networks...' or 'All admins of networks tagged...', then you must specify
           this 'values' property to provide the set of entities to apply the branding
-          policy to. For 'Specific admins...', specify an array of admin IDs. For 'All
-          admins of networks...', specify an array of network IDs and/or configuration
+          policy to. For 'Specific admins...', specify an array of admin IDs. For
+          'All admins of networks...', specify an array of network IDs and/or configuration
           template IDs. For 'All admins of networks tagged...', specify an array of
           tag names.
         elements: str
@@ -51,11 +55,12 @@
         description: Properties for setting the image.
         suboptions:
           contents:
-            description: The file contents (a base 64 encoded string) of your new logo.
+            description: The file contents (a base 64 encoded string) of your new
+              logo.
             type: str
           format:
-            description: The format of the encoded contents. Supported formats are 'png',
-              'gif', and jpg'.
+            description: The format of the encoded contents. Supported formats are
+              'png', 'gif', and jpg'.
             type: str
         type: dict
     type: dict
@@ -72,8 +77,9 @@
       when not provided.
     suboptions:
       apiDocsSubtab:
-        description: The 'Help -> API docs' subtab where a detailed description of the
-          Dashboard API is listed. Can be one of 'default or inherit', 'hide' or 'show'.
+        description: The 'Help -> API docs' subtab where a detailed description of
+          the Dashboard API is listed. Can be one of 'default or inherit', 'hide'
+          or 'show'.
         type: str
       casesSubtab:
         description: The 'Help -> Cases' Dashboard subtab on which Cisco Meraki support
@@ -96,19 +102,19 @@
         type: str
       firewallInfoSubtab:
         description: The 'Help -> Firewall info' subtab where necessary upstream firewall
-          rules for communication to the Cisco Meraki cloud are listed. Can be one of
-          'default or inherit', 'hide' or 'show'.
+          rules for communication to the Cisco Meraki cloud are listed. Can be one
+          of 'default or inherit', 'hide' or 'show'.
         type: str
       getHelpSubtab:
         description: The 'Help -> Get Help' subtab on which Cisco Meraki KB, Product
           Manuals, and Support/Case Information are displayed. Note that if this subtab
           is hidden, branding customizations for the KB on 'Get help', Cisco Meraki
-          product documentation, and support contact info will not be visible. Can be
-          one of 'default or inherit', 'hide' or 'show'.
+          product documentation, and support contact info will not be visible. Can
+          be one of 'default or inherit', 'hide' or 'show'.
         type: str
       getHelpSubtabKnowledgeBaseSearch:
-        description: The KB search box which appears on the Help page. Can be one of
-          'default or inherit', 'hide', 'show', or a replacement custom HTML string.
+        description: The KB search box which appears on the Help page. Can be one
+          of 'default or inherit', 'hide', 'show', or a replacement custom HTML string.
         type: str
       hardwareReplacementsSubtab:
         description: The 'Help -> Replacement info' subtab where important information
@@ -116,9 +122,9 @@
           'hide' or 'show'.
         type: str
       helpTab:
-        description: The Help tab, under which all support information resides. If this
-          tab is hidden, no other 'Help' branding customizations will be visible. Can
-          be one of 'default or inherit', 'hide' or 'show'.
+        description: The Help tab, under which all support information resides. If
+          this tab is hidden, no other 'Help' branding customizations will be visible.
+          Can be one of 'default or inherit', 'hide' or 'show'.
         type: str
       helpWidget:
         description: The 'Help Widget' is a support widget which provides access to
@@ -130,9 +136,10 @@
           are detailed. Can be one of 'default or inherit', 'hide' or 'show'.
         type: str
       smForums:
-        description: The 'SM Forums' subtab which links to community-based support for
-          Cisco Meraki Systems Manager. Only configurable for organizations that contain
-          Systems Manager networks. Can be one of 'default or inherit', 'hide' or 'show'.
+        description: The 'SM Forums' subtab which links to community-based support
+          for Cisco Meraki Systems Manager. Only configurable for organizations that
+          contain Systems Manager networks. Can be one of 'default or inherit', 'hide'
+          or 'show'.
         type: str
       supportContactInfo:
         description: The 'Contact Meraki Support' section of the 'Help -> Get Help'
@@ -140,10 +147,10 @@
           custom HTML string.
         type: str
       universalSearchKnowledgeBaseSearch:
-        description: The universal search box always visible on Dashboard will, by default,
-          present results from the Meraki KB. This configures whether these Meraki KB
-          results should be returned. Can be one of 'default or inherit', 'hide' or
-          'show'.
+        description: The universal search box always visible on Dashboard will, by
+          default, present results from the Meraki KB. This configures whether these
+          Meraki KB results should be returned. Can be one of 'default or inherit',
+          'hide' or 'show'.
         type: str
     type: dict
   name:
@@ -153,59 +160,51 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationBrandingPolicy
-  description: Complete reference of the createOrganizationBrandingPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-branding-policy
-- name: Cisco Meraki documentation for organizations deleteOrganizationBrandingPolicy
-  description: Complete reference of the deleteOrganizationBrandingPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-branding-policy
-- name: Cisco Meraki documentation for organizations updateOrganizationBrandingPolicy
-  description: Complete reference of the updateOrganizationBrandingPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-branding-policy
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_branding_policy,
-    organizations.Organizations.delete_organization_branding_policy,
-    organizations.Organizations.update_organization_branding_policy,
-
-  - Paths used are
-    post /organizations/{organizationId}/brandingPolicies,
-    delete /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
-    put /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
+  - description: Complete reference of the createOrganizationBrandingPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-branding-policy
+    name: Cisco Meraki documentation for organizations createOrganizationBrandingPolicy
+  - description: Complete reference of the deleteOrganizationBrandingPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-branding-policy
+    name: Cisco Meraki documentation for organizations deleteOrganizationBrandingPolicy
+  - description: Complete reference of the updateOrganizationBrandingPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-branding-policy
+    name: Cisco Meraki documentation for organizations updateOrganizationBrandingPolicy
+short_description: Resource module for organizations _branding _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_branding_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     adminSettings:
       appliesTo: All admins of networks...
       values:
-      - N_1234
-      - L_5678
+        - N_1234
+        - L_5678
     customLogo:
       enabled: true
       image:
@@ -230,61 +229,59 @@
       universalSearchKnowledgeBaseSearch: hide
     name: My Branding Policy
     organizationId: string
-
 - name: Delete by id
   cisco.meraki.organizations_branding_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     brandingPolicyId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_branding_policies:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     adminSettings:
       appliesTo: All admins of networks...
       values:
-      - N_1234
-      - L_5678
+        - N_1234
+        - L_5678
     brandingPolicyId: string
     customLogo:
       enabled: true
@@ -310,7 +307,6 @@
       universalSearchKnowledgeBaseSearch: hide
     name: My Branding Policy
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_branding_policies_info.py b/plugins/modules/organizations_branding_policies_info.py
index 6cc9629ca..6cb01f01a 100644
--- a/plugins/modules/organizations_branding_policies_info.py
+++ b/plugins/modules/organizations_branding_policies_info.py
@@ -5,102 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_branding_policies_info
-short_description: Information module for organizations _branding _policies
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _branding _policies.
-- Get organizations _branding _policies by id.
-- List the branding policies of an organization.
-- Return a branding policy.
-version_added: '2.16.0'
+  - Get all organizations _branding _policies.
+  - Get organizations _branding _policies by id.
+  - List the branding policies of an organization.
+  - Return a branding policy.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_branding_policies_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_branding_policies,
+    organizations.Organizations.get_organization_branding_policy,
+  - Paths used are get /organizations/{organizationId}/brandingPolicies, get /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
 options:
+  brandingPolicyId:
+    description:
+      - BrandingPolicyId path parameter. Branding policy ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  brandingPolicyId:
-    description:
-    - BrandingPolicyId path parameter. Branding policy ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationBrandingPolicies
-  description: Complete reference of the getOrganizationBrandingPolicies API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policies
-- name: Cisco Meraki documentation for organizations getOrganizationBrandingPolicy
-  description: Complete reference of the getOrganizationBrandingPolicy API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policy
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_branding_policies,
-    organizations.Organizations.get_organization_branding_policy,
-
-  - Paths used are
-    get /organizations/{organizationId}/brandingPolicies,
-    get /organizations/{organizationId}/brandingPolicies/{brandingPolicyId},
+  - description: Complete reference of the getOrganizationBrandingPolicies API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policies
+    name: Cisco Meraki documentation for organizations getOrganizationBrandingPolicies
+  - description: Complete reference of the getOrganizationBrandingPolicy API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policy
+    name: Cisco Meraki documentation for organizations getOrganizationBrandingPolicy
+short_description: Information module for organizations _branding _policies
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _branding _policies
   cisco.meraki.organizations_branding_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _branding _policies by id
   cisco.meraki.organizations_branding_policies_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     brandingPolicyId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_branding_policies_priorities.py b/plugins/modules/organizations_branding_policies_priorities.py
index a141d2e08..8e460843d 100644
--- a/plugins/modules/organizations_branding_policies_priorities.py
+++ b/plugins/modules/organizations_branding_policies_priorities.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_branding_policies_priorities
-short_description: Resource module for organizations _branding _policies _priorities
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _branding _policies _priorities.
-- Update the priority ordering of an organization's branding policies.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _branding _policies _priorities.
+  - Update the priority ordering of an organization's branding policies.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_branding_policies_priorities
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_branding_policies_priorities,
+  - Paths used are put /organizations/{organizationId}/brandingPolicies/priorities,
 options:
   brandingPolicyIds:
     description: An ordered list of branding policy IDs that determines the priority
@@ -25,50 +25,46 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationBrandingPoliciesPriorities
-  description: Complete reference of the updateOrganizationBrandingPoliciesPriorities API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-branding-policies-priorities
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_branding_policies_priorities,
-
-  - Paths used are
-    put /organizations/{organizationId}/brandingPolicies/priorities,
+  - description: Complete reference of the updateOrganizationBrandingPoliciesPriorities
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-branding-policies-priorities
+    name: Cisco Meraki documentation for organizations updateOrganizationBrandingPoliciesPriorities
+short_description: Resource module for organizations _branding _policies _priorities
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_branding_policies_priorities:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     brandingPolicyIds:
-    - '123'
-    - '456'
-    - '789'
+      - '123'
+      - '456'
+      - '789'
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_branding_policies_priorities_info.py b/plugins/modules/organizations_branding_policies_priorities_info.py
index 9dccfdc24..47a77fd1f 100644
--- a/plugins/modules/organizations_branding_policies_priorities_info.py
+++ b/plugins/modules/organizations_branding_policies_priorities_info.py
@@ -5,67 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_branding_policies_priorities_info
-short_description: Information module for organizations _branding _policies _priorities
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _branding _policies _priorities.
-- >
-   Return the branding policy IDs of an organization in priority order. IDs are ordered in ascending order of
-   priority IDs later in the array have higher priority .
-version_added: '2.16.0'
+  - Get all organizations _branding _policies _priorities.
+  - 'Return the branding policy IDs of an organization in priority order. IDs are
+    ordered in ascending order of priority IDs later in the array have higher priority
+    .
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_branding_policies_priorities_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_branding_policies_priorities,
+  - Paths used are get /organizations/{organizationId}/brandingPolicies/priorities,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationBrandingPoliciesPriorities
-  description: Complete reference of the getOrganizationBrandingPoliciesPriorities API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policies-priorities
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_branding_policies_priorities,
-
-  - Paths used are
-    get /organizations/{organizationId}/brandingPolicies/priorities,
+  - description: Complete reference of the getOrganizationBrandingPoliciesPriorities
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-branding-policies-priorities
+    name: Cisco Meraki documentation for organizations getOrganizationBrandingPoliciesPriorities
+short_description: Information module for organizations _branding _policies _priorities
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _branding _policies _priorities
   cisco.meraki.organizations_branding_policies_priorities_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_boundaries_areas_by_device_info.py b/plugins/modules/organizations_camera_boundaries_areas_by_device_info.py
index 086e32152..952140b8f 100644
--- a/plugins/modules/organizations_camera_boundaries_areas_by_device_info.py
+++ b/plugins/modules/organizations_camera_boundaries_areas_by_device_info.py
@@ -5,73 +5,71 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_boundaries_areas_by_device_info
-short_description: Information module for organizations _camera _boundaries _areas _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _camera _boundaries _areas _by _device.
-- Returns all configured area boundaries of cameras.
-version_added: '2.16.0'
+  - Get all organizations _camera _boundaries _areas _by _device.
+  - Returns all configured area boundaries of cameras.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_boundaries_areas_by_device_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_boundaries_areas_by_device,
+  - Paths used are get /organizations/{organizationId}/camera/boundaries/areas/byDevice,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   serials:
     description:
-    - >
-      Serials query parameter. A list of serial numbers. The returned cameras will be filtered to only include
-      these serials.
+      - 'Serials query parameter. A list of serial numbers. The returned cameras will
+        be filtered to only include these serials.
+
+        '
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraBoundariesAreasByDevice
-  description: Complete reference of the getOrganizationCameraBoundariesAreasByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-boundaries-areas-by-device
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_boundaries_areas_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/boundaries/areas/byDevice,
+  - description: Complete reference of the getOrganizationCameraBoundariesAreasByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-boundaries-areas-by-device
+    name: Cisco Meraki documentation for camera getOrganizationCameraBoundariesAreasByDevice
+short_description: Information module for organizations _camera _boundaries _areas
+  _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _camera _boundaries _areas _by _device
   cisco.meraki.organizations_camera_boundaries_areas_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_boundaries_lines_by_device_info.py b/plugins/modules/organizations_camera_boundaries_lines_by_device_info.py
index c96463935..8d668aa14 100644
--- a/plugins/modules/organizations_camera_boundaries_lines_by_device_info.py
+++ b/plugins/modules/organizations_camera_boundaries_lines_by_device_info.py
@@ -5,73 +5,71 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_boundaries_lines_by_device_info
-short_description: Information module for organizations _camera _boundaries _lines _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _camera _boundaries _lines _by _device.
-- Returns all configured crossingline boundaries of cameras.
-version_added: '2.16.0'
+  - Get all organizations _camera _boundaries _lines _by _device.
+  - Returns all configured crossingline boundaries of cameras.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_boundaries_lines_by_device_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_boundaries_lines_by_device,
+  - Paths used are get /organizations/{organizationId}/camera/boundaries/lines/byDevice,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   serials:
     description:
-    - >
-      Serials query parameter. A list of serial numbers. The returned cameras will be filtered to only include
-      these serials.
+      - 'Serials query parameter. A list of serial numbers. The returned cameras will
+        be filtered to only include these serials.
+
+        '
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraBoundariesLinesByDevice
-  description: Complete reference of the getOrganizationCameraBoundariesLinesByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-boundaries-lines-by-device
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_boundaries_lines_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/boundaries/lines/byDevice,
+  - description: Complete reference of the getOrganizationCameraBoundariesLinesByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-boundaries-lines-by-device
+    name: Cisco Meraki documentation for camera getOrganizationCameraBoundariesLinesByDevice
+short_description: Information module for organizations _camera _boundaries _lines
+  _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _camera _boundaries _lines _by _device
   cisco.meraki.organizations_camera_boundaries_lines_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_custom_analytics_artifacts.py b/plugins/modules/organizations_camera_custom_analytics_artifacts.py
index db90f73a3..dbab93b85 100644
--- a/plugins/modules/organizations_camera_custom_analytics_artifacts.py
+++ b/plugins/modules/organizations_camera_custom_analytics_artifacts.py
@@ -5,19 +5,24 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_custom_analytics_artifacts
-short_description: Resource module for organizations _camera _custom _analytics _artifacts
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create and delete of the resource organizations _camera _custom _analytics _artifacts.
-- >
-   Create custom analytics artifact. Returns an artifact upload URL with expiry time. Upload the artifact file with a
-   put request to the returned upload URL before its expiry.
-- Delete Custom Analytics Artifact.
-version_added: '2.16.0'
+  - Manage operations create and delete of the resource organizations _camera _custom
+    _analytics _artifacts.
+  - 'Create custom analytics artifact. Returns an artifact upload URL with expiry
+    time. Upload the artifact file with a put request to the returned upload URL before
+    its expiry.
+
+    '
+  - Delete Custom Analytics Artifact.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_custom_analytics_artifacts
+notes:
+  - SDK Method used are camera.Camera.create_organization_camera_custom_analytics_artifact,
+    camera.Camera.delete_organization_camera_custom_analytics_artifact,
+  - Paths used are post /organizations/{organizationId}/camera/customAnalytics/artifacts,
+    delete /organizations/{organizationId}/camera/customAnalytics/artifacts/{artifactId},
 options:
   artifactId:
     description: ArtifactId path parameter. Artifact ID.
@@ -29,78 +34,72 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera createOrganizationCameraCustomAnalyticsArtifact
-  description: Complete reference of the createOrganizationCameraCustomAnalyticsArtifact API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-camera-custom-analytics-artifact
-- name: Cisco Meraki documentation for camera deleteOrganizationCameraCustomAnalyticsArtifact
-  description: Complete reference of the deleteOrganizationCameraCustomAnalyticsArtifact API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-camera-custom-analytics-artifact
-notes:
-  - SDK Method used are
-    camera.Camera.create_organization_camera_custom_analytics_artifact,
-    camera.Camera.delete_organization_camera_custom_analytics_artifact,
-
-  - Paths used are
-    post /organizations/{organizationId}/camera/customAnalytics/artifacts,
-    delete /organizations/{organizationId}/camera/customAnalytics/artifacts/{artifactId},
+  - description: Complete reference of the createOrganizationCameraCustomAnalyticsArtifact
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-camera-custom-analytics-artifact
+    name: Cisco Meraki documentation for camera createOrganizationCameraCustomAnalyticsArtifact
+  - description: Complete reference of the deleteOrganizationCameraCustomAnalyticsArtifact
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-camera-custom-analytics-artifact
+    name: Cisco Meraki documentation for camera deleteOrganizationCameraCustomAnalyticsArtifact
+short_description: Resource module for organizations _camera _custom _analytics _artifacts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_camera_custom_analytics_artifacts:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: example
     organizationId: string
-
 - name: Delete by id
   cisco.meraki.organizations_camera_custom_analytics_artifacts:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     artifactId: string
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_custom_analytics_artifacts_info.py b/plugins/modules/organizations_camera_custom_analytics_artifacts_info.py
index 371beaf8d..a36527308 100644
--- a/plugins/modules/organizations_camera_custom_analytics_artifacts_info.py
+++ b/plugins/modules/organizations_camera_custom_analytics_artifacts_info.py
@@ -5,102 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_custom_analytics_artifacts_info
-short_description: Information module for organizations _camera _custom _analytics _artifacts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _camera _custom _analytics _artifacts.
-- Get organizations _camera _custom _analytics _artifacts by id.
-- Get Custom Analytics Artifact.
-- List Custom Analytics Artifacts.
-version_added: '2.16.0'
+  - Get all organizations _camera _custom _analytics _artifacts.
+  - Get organizations _camera _custom _analytics _artifacts by id.
+  - Get Custom Analytics Artifact.
+  - List Custom Analytics Artifacts.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_custom_analytics_artifacts_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_custom_analytics_artifact,
+    camera.Camera.get_organization_camera_custom_analytics_artifacts,
+  - Paths used are get /organizations/{organizationId}/camera/customAnalytics/artifacts,
+    get /organizations/{organizationId}/camera/customAnalytics/artifacts/{artifactId},
 options:
+  artifactId:
+    description:
+      - ArtifactId path parameter. Artifact ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  artifactId:
-    description:
-    - ArtifactId path parameter. Artifact ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraCustomAnalyticsArtifact
-  description: Complete reference of the getOrganizationCameraCustomAnalyticsArtifact API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-custom-analytics-artifact
-- name: Cisco Meraki documentation for camera getOrganizationCameraCustomAnalyticsArtifacts
-  description: Complete reference of the getOrganizationCameraCustomAnalyticsArtifacts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-custom-analytics-artifacts
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_custom_analytics_artifact,
-    camera.Camera.get_organization_camera_custom_analytics_artifacts,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/customAnalytics/artifacts,
-    get /organizations/{organizationId}/camera/customAnalytics/artifacts/{artifactId},
+  - description: Complete reference of the getOrganizationCameraCustomAnalyticsArtifact
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-custom-analytics-artifact
+    name: Cisco Meraki documentation for camera getOrganizationCameraCustomAnalyticsArtifact
+  - description: Complete reference of the getOrganizationCameraCustomAnalyticsArtifacts
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-custom-analytics-artifacts
+    name: Cisco Meraki documentation for camera getOrganizationCameraCustomAnalyticsArtifacts
+short_description: Information module for organizations _camera _custom _analytics
+  _artifacts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _camera _custom _analytics _artifacts
   cisco.meraki.organizations_camera_custom_analytics_artifacts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _camera _custom _analytics _artifacts by id
   cisco.meraki.organizations_camera_custom_analytics_artifacts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     artifactId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_detections_history_by_boundary_by_interval_info.py b/plugins/modules/organizations_camera_detections_history_by_boundary_by_interval_info.py
index 31d987514..6a25e5d96 100644
--- a/plugins/modules/organizations_camera_detections_history_by_boundary_by_interval_info.py
+++ b/plugins/modules/organizations_camera_detections_history_by_boundary_by_interval_info.py
@@ -5,90 +5,92 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_detections_history_by_boundary_by_interval_info
-short_description: Information module for organizations _camera _detections _history _by _boundary _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _camera _detections _history _by _boundary _by _interval.
-- Returns analytics data for timespans.
-version_added: '2.16.0'
+  - Get all organizations _camera _detections _history _by _boundary _by _interval.
+  - Returns analytics data for timespans.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_detections_history_by_boundary_by_interval_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_detections_history_by_boundary_by_interval,
+  - Paths used are get /organizations/{organizationId}/camera/detections/history/byBoundary/byInterval,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   boundaryIds:
     description:
-    - >
-      BoundaryIds query parameter. A list of boundary ids. The returned cameras will be filtered to only include
-      these ids.
+      - 'BoundaryIds query parameter. A list of boundary ids. The returned cameras
+        will be filtered to only include these ids.
+
+        '
     elements: str
     type: list
-  ranges:
+  boundaryTypes:
     description:
-    - Ranges query parameter. A list of time ranges with intervals.
-    elements: dict
+      - BoundaryTypes query parameter. The detection types. Defaults to 'person'.
+    elements: str
     type: list
   duration:
     description:
-    - >
-      Duration query parameter. The minimum time, in seconds, that the person or car remains in the area to be
-      counted. Defaults to boundary configuration or 60.
+      - 'Duration query parameter. The minimum time, in seconds, that the person or
+        car remains in the area to be counted. Defaults to boundary configuration
+        or 60.
+
+        '
     type: int
+  headers:
+    description: Additional headers.
+    type: dict
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 1 - 1000. Defaults to 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 1 - 1000. Defaults to 1000.
     type: int
-  boundaryTypes:
+  ranges:
     description:
-    - BoundaryTypes query parameter. The detection types. Defaults to 'person'.
-    elements: str
+      - Ranges query parameter. A list of time ranges with intervals.
+    elements: dict
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraDetectionsHistoryByBoundaryByInterval
-  description: Complete reference of the getOrganizationCameraDetectionsHistoryByBoundaryByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-detections-history-by-boundary-by-interval
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_detections_history_by_boundary_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/detections/history/byBoundary/byInterval,
+  - description: Complete reference of the getOrganizationCameraDetectionsHistoryByBoundaryByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-detections-history-by-boundary-by-interval
+    name: Cisco Meraki documentation for camera getOrganizationCameraDetectionsHistoryByBoundaryByInterval
+short_description: Information module for organizations _camera _detections _history
+  _by _boundary _by _interval
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _camera _detections _history _by _boundary _by _interval
   cisco.meraki.organizations_camera_detections_history_by_boundary_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     boundaryIds: []
     ranges: []
     duration: 0
@@ -98,7 +100,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_permissions_info.py b/plugins/modules/organizations_camera_permissions_info.py
index 3a4cfa35b..357d8ebce 100644
--- a/plugins/modules/organizations_camera_permissions_info.py
+++ b/plugins/modules/organizations_camera_permissions_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_permissions_info
-short_description: Information module for organizations _camera _permissions
+author: Francisco Munoz (@fmunoz)
 description:
-- Get organizations _camera _permissions by id.
-- Retrieve a single permission scope.
-version_added: '2.16.0'
+  - Get organizations _camera _permissions by id.
+  - Retrieve a single permission scope.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_permissions_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_permission,
+  - Paths used are get /organizations/{organizationId}/camera/permissions/{permissionScopeId},
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   permissionScopeId:
     description:
-    - PermissionScopeId path parameter. Permission scope ID.
+      - PermissionScopeId path parameter. Permission scope ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraPermission
-  description: Complete reference of the getOrganizationCameraPermission API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-permission
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_permission,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/permissions/{permissionScopeId},
+  - description: Complete reference of the getOrganizationCameraPermission API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-permission
+    name: Cisco Meraki documentation for camera getOrganizationCameraPermission
+short_description: Information module for organizations _camera _permissions
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get organizations _camera _permissions by id
   cisco.meraki.organizations_camera_permissions_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     permissionScopeId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_roles.py b/plugins/modules/organizations_camera_roles.py
index 042890863..406e79d60 100644
--- a/plugins/modules/organizations_camera_roles.py
+++ b/plugins/modules/organizations_camera_roles.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_roles
-short_description: Resource module for organizations _camera _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _camera _roles.
-- Creates new role for this organization.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _camera
+    _roles.
+  - Creates new role for this organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_roles
+notes:
+  - SDK Method used are camera.Camera.create_organization_camera_role,
+  - Paths used are post /organizations/{organizationId}/camera/roles,
 options:
   appliedOnDevices:
     description: Device tag on which this specified permission is applied.
@@ -65,59 +66,54 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera createOrganizationCameraRole
-  description: Complete reference of the createOrganizationCameraRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-camera-role
-notes:
-  - SDK Method used are
-    camera.Camera.create_organization_camera_role,
-
-  - Paths used are
-    post /organizations/{organizationId}/camera/roles,
+  - description: Complete reference of the createOrganizationCameraRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-camera-role
+    name: Cisco Meraki documentation for camera createOrganizationCameraRole
+short_description: Resource module for organizations _camera _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_camera_roles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     appliedOnDevices:
-    - id: ''
-      permissionScopeId: '1'
-      tag: reception-desk
+      - id: ''
+        permissionScopeId: '1'
+        tag: reception-desk
     appliedOnNetworks:
-    - id: ''
-      permissionScopeId: '2'
-      tag: building-a
+      - id: ''
+        permissionScopeId: '2'
+        tag: building-a
     appliedOrgWide:
-    - id: ''
-      permissionScopeId: '2'
-      tag: building-a
+      - id: ''
+        permissionScopeId: '2'
+        tag: building-a
     name: Security_Guard
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_camera_roles_info.py b/plugins/modules/organizations_camera_roles_info.py
index a8a5a3126..d1447cd68 100644
--- a/plugins/modules/organizations_camera_roles_info.py
+++ b/plugins/modules/organizations_camera_roles_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_camera_roles_info
-short_description: Information module for organizations _camera _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _camera _roles.
-- List all the roles in this organization.
-version_added: '2.16.0'
+  - Get all organizations _camera _roles.
+  - List all the roles in this organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_camera_roles_info
+notes:
+  - SDK Method used are camera.Camera.get_organization_camera_roles,
+  - Paths used are get /organizations/{organizationId}/camera/roles,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for camera getOrganizationCameraRoles
-  description: Complete reference of the getOrganizationCameraRoles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-roles
-notes:
-  - SDK Method used are
-    camera.Camera.get_organization_camera_roles,
-
-  - Paths used are
-    get /organizations/{organizationId}/camera/roles,
+  - description: Complete reference of the getOrganizationCameraRoles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-camera-roles
+    name: Cisco Meraki documentation for camera getOrganizationCameraRoles
+short_description: Information module for organizations _camera _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _camera _roles
   cisco.meraki.organizations_camera_roles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_inventory_info.py b/plugins/modules/organizations_cellular_gateway_esims_inventory_info.py
index 985990dfc..2b6265f14 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_inventory_info.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_inventory_info.py
@@ -5,71 +5,68 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_inventory_info
-short_description: Information module for organizations _cellular _gateway _esims _inventory
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _esims _inventory.
-- The eSIM inventory of a given organization.
-version_added: '2.20.0'
+  - Get all organizations _cellular _gateway _esims _inventory.
+  - The eSIM inventory of a given organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_inventory_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_inventory,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/esims/inventory,
 options:
+  eids:
+    description:
+      - Eids query parameter. Optional parameter to filter the results by EID.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  eids:
-    description:
-    - Eids query parameter. Optional parameter to filter the results by EID.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsInventory
-  description: Complete reference of the getOrganizationCellularGatewayEsimsInventory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-inventory
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_inventory,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/esims/inventory,
+  - description: Complete reference of the getOrganizationCellularGatewayEsimsInventory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-inventory
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsInventory
+short_description: Information module for organizations _cellular _gateway _esims
+  _inventory
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _cellular _gateway _esims _inventory
   cisco.meraki.organizations_cellular_gateway_esims_inventory_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     eids: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts.py b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts.py
index f8b8943a5..ad4d8de3b 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_service_providers_accounts
-short_description: Resource module for organizations _cellular _gateway _esims _service _providers _accounts
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _cellular _gateway _esims _service _providers _accounts.
-- Add a service provider account.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _cellular _gateway _esims
+    _service _providers _accounts.
+  - Add a service provider account.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_service_providers_accounts
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.create_organization_cellular_gateway_esims_service_providers_account,
+  - Paths used are post /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts,
 options:
   accountId:
     description: Service provider account ID.
@@ -39,43 +40,41 @@
     description: Service provider account username.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway createOrganizationCellularGatewayEsimsServiceProvidersAccount
-  description: Complete reference of the createOrganizationCellularGatewayEsimsServiceProvidersAccount API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-cellular-gateway-esims-service-providers-account
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.create_organization_cellular_gateway_esims_service_providers_account,
-
-  - Paths used are
-    post /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts,
+  - description: Complete reference of the createOrganizationCellularGatewayEsimsServiceProvidersAccount
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-cellular-gateway-esims-service-providers-account
+    name: Cisco Meraki documentation for cellularGateway createOrganizationCellularGatewayEsimsServiceProvidersAccount
+short_description: Resource module for organizations _cellular _gateway _esims _service
+  _providers _accounts
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_cellular_gateway_esims_service_providers_accounts:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accountId: 0987654321
     apiKey: foobarfoobarfoobarfoobarfoobarfoobar
@@ -84,7 +83,6 @@
       name: ATT
     title: My AT&T account
     username: MerakiUser
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info.py b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info.py
index a1aa8b1e8..594f50089 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info.py
@@ -5,71 +5,71 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info
-short_description: Information module for organizations _cellular _gateway _esims _service _providers _accounts _communication _plans
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _esims _service _providers _accounts _communication _plans.
-- The communication plans available for a given provider.
-version_added: '2.20.0'
+  - Get all organizations _cellular _gateway _esims _service _providers _accounts
+    _communication _plans.
+  - The communication plans available for a given provider.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts_communication_plans,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts/communicationPlans,
 options:
+  accountIds:
+    description:
+      - AccountIds query parameter. Account IDs that communication plans will be fetched
+        for.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  accountIds:
-    description:
-    - AccountIds query parameter. Account IDs that communication plans will be fetched for.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccountsCommunicationPlans
-  description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccountsCommunicationPlans API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts-communication-plans
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts_communication_plans,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts/communicationPlans,
+  - description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccountsCommunicationPlans
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts-communication-plans
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccountsCommunicationPlans
+short_description: Information module for organizations _cellular _gateway _esims
+  _service _providers _accounts _communication _plans
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _cellular _gateway _esims _service _providers _accounts _communication _plans
+- name: Get all organizations _cellular _gateway _esims _service _providers _accounts
+    _communication _plans
   cisco.meraki.organizations_cellular_gateway_esims_service_providers_accounts_communication_plans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     accountIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_info.py b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_info.py
index b00f25c16..d0ebc6d04 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_info.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_info.py
@@ -5,71 +5,69 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_service_providers_accounts_info
-short_description: Information module for organizations _cellular _gateway _esims _service _providers _accounts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _esims _service _providers _accounts.
-- Inventory of service provider accounts tied to the organization.
-version_added: '2.20.0'
+  - Get all organizations _cellular _gateway _esims _service _providers _accounts.
+  - Inventory of service provider accounts tied to the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_service_providers_accounts_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts,
 options:
+  accountIds:
+    description:
+      - AccountIds query parameter. Optional parameter to filter the results by service
+        provider account IDs.
+    elements: int
+    type: list
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  accountIds:
-    description:
-    - AccountIds query parameter. Optional parameter to filter the results by service provider account IDs.
-    elements: int
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccounts
-  description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccounts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts,
+  - description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccounts
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccounts
+short_description: Information module for organizations _cellular _gateway _esims
+  _service _providers _accounts
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _cellular _gateway _esims _service _providers _accounts
   cisco.meraki.organizations_cellular_gateway_esims_service_providers_accounts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     accountIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info.py b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info.py
index 554750546..9e2c53de1 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info.py
@@ -5,71 +5,70 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info
-short_description: Information module for organizations _cellular _gateway _esims _service _providers _accounts _rate _plans
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _esims _service _providers _accounts _rate _plans.
-- The rate plans available for a given provider.
-version_added: '2.20.0'
+  - Get all organizations _cellular _gateway _esims _service _providers _accounts
+    _rate _plans.
+  - The rate plans available for a given provider.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts_rate_plans,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts/ratePlans,
 options:
+  accountIds:
+    description:
+      - AccountIds query parameter. Account IDs that rate plans will be fetched for.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  accountIds:
-    description:
-    - AccountIds query parameter. Account IDs that rate plans will be fetched for.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccountsRatePlans
-  description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccountsRatePlans API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts-rate-plans
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers_accounts_rate_plans,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/esims/serviceProviders/accounts/ratePlans,
+  - description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProvidersAccountsRatePlans
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers-accounts-rate-plans
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProvidersAccountsRatePlans
+short_description: Information module for organizations _cellular _gateway _esims
+  _service _providers _accounts _rate _plans
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _cellular _gateway _esims _service _providers _accounts _rate _plans
+- name: Get all organizations _cellular _gateway _esims _service _providers _accounts
+    _rate _plans
   cisco.meraki.organizations_cellular_gateway_esims_service_providers_accounts_rate_plans_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     accountIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_service_providers_info.py b/plugins/modules/organizations_cellular_gateway_esims_service_providers_info.py
index c4ced1cd1..62fc5c492 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_service_providers_info.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_service_providers_info.py
@@ -5,65 +5,62 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_service_providers_info
-short_description: Information module for organizations _cellular _gateway _esims _service _providers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _esims _service _providers.
-- Service providers customers can add accounts for.
-version_added: '2.20.0'
+  - Get all organizations _cellular _gateway _esims _service _providers.
+  - Service providers customers can add accounts for.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_service_providers_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/esims/serviceProviders,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProviders
-  description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProviders API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_esims_service_providers,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/esims/serviceProviders,
+  - description: Complete reference of the getOrganizationCellularGatewayEsimsServiceProviders
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-esims-service-providers
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayEsimsServiceProviders
+short_description: Information module for organizations _cellular _gateway _esims
+  _service _providers
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _cellular _gateway _esims _service _providers
   cisco.meraki.organizations_cellular_gateway_esims_service_providers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_esims_swap.py b/plugins/modules/organizations_cellular_gateway_esims_swap.py
index 7e0e2889d..71d257c75 100644
--- a/plugins/modules/organizations_cellular_gateway_esims_swap.py
+++ b/plugins/modules/organizations_cellular_gateway_esims_swap.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_esims_swap
-short_description: Resource module for organizations _cellular _gateway _esims _swap
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _cellular _gateway _esims _swap.
-- Swap which profile an eSIM uses.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _cellular _gateway _esims
+    _swap.
+  - Swap which profile an eSIM uses.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_esims_swap
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.create_organization_cellular_gateway_esims_swap,
+  - Paths used are post /organizations/{organizationId}/cellularGateway/esims/swap,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -42,51 +43,47 @@
         type: dict
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway createOrganizationCellularGatewayEsimsSwap
-  description: Complete reference of the createOrganizationCellularGatewayEsimsSwap API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-cellular-gateway-esims-swap
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.create_organization_cellular_gateway_esims_swap,
-
-  - Paths used are
-    post /organizations/{organizationId}/cellularGateway/esims/swap,
+  - description: Complete reference of the createOrganizationCellularGatewayEsimsSwap
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-cellular-gateway-esims-swap
+    name: Cisco Meraki documentation for cellularGateway createOrganizationCellularGatewayEsimsSwap
+short_description: Resource module for organizations _cellular _gateway _esims _swap
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_cellular_gateway_esims_swap:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     swaps:
-    - eid: '1234567890'
-      target:
-        accountId: '456'
-        communicationPlan: A comm plan
-        ratePlan: A rate plan
-
+      - eid: '1234567890'
+        target:
+          accountId: '456'
+          communicationPlan: A comm plan
+          ratePlan: A rate plan
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_cellular_gateway_uplink_statuses_info.py b/plugins/modules/organizations_cellular_gateway_uplink_statuses_info.py
index 154175941..e1c850e78 100644
--- a/plugins/modules/organizations_cellular_gateway_uplink_statuses_info.py
+++ b/plugins/modules/organizations_cellular_gateway_uplink_statuses_info.py
@@ -5,100 +5,108 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_cellular_gateway_uplink_statuses_info
-short_description: Information module for organizations _cellular _gateway _uplink _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _cellular _gateway _uplink _statuses.
-- List the uplink status of every Meraki MG cellular gateway in the organization.
-version_added: '2.16.0'
+  - Get all organizations _cellular _gateway _uplink _statuses.
+  - List the uplink status of every Meraki MG cellular gateway in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_cellular_gateway_uplink_statuses_info
+notes:
+  - SDK Method used are cellular_gateway.CellularGateway.get_organization_cellular_gateway_uplink_statuses,
+  - Paths used are get /organizations/{organizationId}/cellularGateway/uplink/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  iccids:
+    description:
+      - Iccids query parameter. A list of ICCIDs. The returned devices will be filtered
+        to only include these ICCIDs.
+    elements: str
+    type: list
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. A list of network IDs. The returned devices will
+        be filtered to only include these networks.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. A list of network IDs. The returned devices will be filtered to only include
-      these networks.
-    elements: str
-    type: list
   serials:
     description:
-    - >
-      Serials query parameter. A list of serial numbers. The returned devices will be filtered to only include
-      these serials.
+      - 'Serials query parameter. A list of serial numbers. The returned devices will
+        be filtered to only include these serials.
+
+        '
     elements: str
     type: list
-  iccids:
+  startingAfter:
     description:
-    - Iccids query parameter. A list of ICCIDs. The returned devices will be filtered to only include these ICCIDs.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayUplinkStatuses
-  description: Complete reference of the getOrganizationCellularGatewayUplinkStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-uplink-statuses
-notes:
-  - SDK Method used are
-    cellular_gateway.CellularGateway.get_organization_cellular_gateway_uplink_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/cellularGateway/uplink/statuses,
+  - description: Complete reference of the getOrganizationCellularGatewayUplinkStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-cellular-gateway-uplink-statuses
+    name: Cisco Meraki documentation for cellularGateway getOrganizationCellularGatewayUplinkStatuses
+short_description: Information module for organizations _cellular _gateway _uplink
+  _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _cellular _gateway _uplink _statuses
   cisco.meraki.organizations_cellular_gateway_uplink_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -109,7 +117,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_claim.py b/plugins/modules/organizations_claim.py
index cafc57763..cbbd4d682 100644
--- a/plugins/modules/organizations_claim.py
+++ b/plugins/modules/organizations_claim.py
@@ -5,20 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_claim
-short_description: Resource module for organizations _claim
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _claim.
-- >
-   Claim a list of devices, licenses, and/or orders into an organization inventory. When claiming by order, all
-   devices and licenses in the order will be claimed; licenses will be added to the organization and devices will be
-   placed in the organization's inventory. This operation can be used up to ten times within a single five minute
-   window.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _claim.
+  - 'Claim a list of devices, licenses, and/or orders into an organization inventory.
+    When claiming by order, all devices and licenses in the order will be claimed;
+    licenses will be added to the organization and devices will be placed in the organization''s
+    inventory. This operation can be used up to ten times within a single five minute
+    window.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_claim
+notes:
+  - SDK Method used are organizations.Organizations.claim_into_organization,
+  - Paths used are post /organizations/{organizationId}/claim,
 options:
   licenses:
     description: The licenses that should be claimed.
@@ -47,52 +49,47 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations claimIntoOrganization
-  description: Complete reference of the claimIntoOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!claim-into-organization
-notes:
-  - SDK Method used are
-    organizations.Organizations.claim_into_organization,
-
-  - Paths used are
-    post /organizations/{organizationId}/claim,
+  - description: Complete reference of the claimIntoOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!claim-into-organization
+    name: Cisco Meraki documentation for organizations claimIntoOrganization
+short_description: Resource module for organizations _claim
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_claim:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     licenses:
-    - key: Z2XXXXXXXXXX
-      mode: addDevices
+      - key: Z2XXXXXXXXXX
+        mode: addDevices
     orders:
-    - 4CXXXXXXX
+      - 4CXXXXXXX
     organizationId: string
     serials:
-    - Q234-ABCD-5678
-
+      - Q234-ABCD-5678
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_clients_bandwidth_usage_history_info.py b/plugins/modules/organizations_clients_bandwidth_usage_history_info.py
index 235fd6ff3..a92252467 100644
--- a/plugins/modules/organizations_clients_bandwidth_usage_history_info.py
+++ b/plugins/modules/organizations_clients_bandwidth_usage_history_info.py
@@ -5,95 +5,97 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_clients_bandwidth_usage_history_info
-short_description: Information module for organizations _clients _bandwidth _usage _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _clients _bandwidth _usage _history.
-- >
-   Return data usage in megabits per second over time for all clients in the given organization within a given time
-   range.
-version_added: '2.16.0'
+  - Get all organizations _clients _bandwidth _usage _history.
+  - 'Return data usage in megabits per second over time for all clients in the given
+    organization within a given time range.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_clients_bandwidth_usage_history_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_clients_bandwidth_usage_history,
+  - Paths used are get /organizations/{organizationId}/clients/bandwidthUsageHistory,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 186 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 186 days. The default
+        is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationClientsBandwidthUsageHistory
-  description: Complete reference of the getOrganizationClientsBandwidthUsageHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-bandwidth-usage-history
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_clients_bandwidth_usage_history,
-
-  - Paths used are
-    get /organizations/{organizationId}/clients/bandwidthUsageHistory,
+  - description: Complete reference of the getOrganizationClientsBandwidthUsageHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-bandwidth-usage-history
+    name: Cisco Meraki documentation for organizations getOrganizationClientsBandwidthUsageHistory
+short_description: Information module for organizations _clients _bandwidth _usage
+  _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _clients _bandwidth _usage _history
   cisco.meraki.organizations_clients_bandwidth_usage_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     ssidName: string
@@ -103,7 +105,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_clients_overview_info.py b/plugins/modules/organizations_clients_overview_info.py
index 75d4f168c..3e27d8fc1 100644
--- a/plugins/modules/organizations_clients_overview_info.py
+++ b/plugins/modules/organizations_clients_overview_info.py
@@ -5,83 +5,81 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_clients_overview_info
-short_description: Information module for organizations _clients _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _clients _overview.
-- Return summary information around client data usage in kb across the given organization.
-version_added: '2.16.0'
+  - Get all organizations _clients _overview.
+  - Return summary information around client data usage in kb across the given organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_clients_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_clients_overview,
+  - Paths used are get /organizations/{organizationId}/clients/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 1 day.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationClientsOverview
-  description: Complete reference of the getOrganizationClientsOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_clients_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/clients/overview,
+  - description: Complete reference of the getOrganizationClientsOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-overview
+    name: Cisco Meraki documentation for organizations getOrganizationClientsOverview
+short_description: Information module for organizations _clients _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _clients _overview
   cisco.meraki.organizations_clients_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_clients_search_info.py b/plugins/modules/organizations_clients_search_info.py
index 1f91a762c..dc5ca01dd 100644
--- a/plugins/modules/organizations_clients_search_info.py
+++ b/plugins/modules/organizations_clients_search_info.py
@@ -5,85 +5,88 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_clients_search_info
-short_description: Information module for organizations _clients _search
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _clients _search.
-- Return the client details in an organization.
-version_added: '2.16.0'
+  - Get all organizations _clients _search.
+  - Return the client details in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_clients_search_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_clients_search,
+  - Paths used are get /organizations/{organizationId}/clients/search,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  mac:
+    description:
+      - Mac query parameter. The MAC address of the client. Required.
+    type: str
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 5. Default is 5.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 5. Default is 5.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  mac:
-    description:
-    - Mac query parameter. The MAC address of the client. Required.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationClientsSearch
-  description: Complete reference of the getOrganizationClientsSearch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-search
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_clients_search,
-
-  - Paths used are
-    get /organizations/{organizationId}/clients/search,
+  - description: Complete reference of the getOrganizationClientsSearch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-clients-search
+    name: Cisco Meraki documentation for organizations getOrganizationClientsSearch
+short_description: Information module for organizations _clients _search
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _clients _search
   cisco.meraki.organizations_clients_search_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -92,7 +95,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_clone.py b/plugins/modules/organizations_clone.py
index cf0622de2..dc59e782d 100644
--- a/plugins/modules/organizations_clone.py
+++ b/plugins/modules/organizations_clone.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_clone
-short_description: Resource module for organizations _clone
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _clone.
-- Create a new organization by cloning the addressed organization.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _clone.
+  - Create a new organization by cloning the addressed organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_clone
+notes:
+  - SDK Method used are organizations.Organizations.clone_organization,
+  - Paths used are post /organizations/{organizationId}/clone,
 options:
   name:
     description: The name of the new organization.
@@ -23,46 +23,41 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations cloneOrganization
-  description: Complete reference of the cloneOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!clone-organization
-notes:
-  - SDK Method used are
-    organizations.Organizations.clone_organization,
-
-  - Paths used are
-    post /organizations/{organizationId}/clone,
+  - description: Complete reference of the cloneOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!clone-organization
+    name: Cisco Meraki documentation for organizations cloneOrganization
+short_description: Resource module for organizations _clone
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_clone:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     name: My organization
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_config_templates.py b/plugins/modules/organizations_config_templates.py
index 3b9c95c58..90e8278db 100644
--- a/plugins/modules/organizations_config_templates.py
+++ b/plugins/modules/organizations_config_templates.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_config_templates
-short_description: Resource module for organizations _config _templates
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _config _templates.
-- Create a new configuration template.
-- Remove a configuration template.
-- Update a configuration template.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _config
+    _templates.
+  - Create a new configuration template.
+  - Remove a configuration template.
+  - Update a configuration template.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_config_templates
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_config_template,
+    organizations.Organizations.delete_organization_config_template, organizations.Organizations.update_organization_config_template,
+  - Paths used are post /organizations/{organizationId}/configTemplates, delete /organizations/{organizationId}/configTemplates/{configTemplateId},
+    put /organizations/{organizationId}/configTemplates/{configTemplateId},
 options:
   configTemplateId:
     description: ConfigTemplateId path parameter. Config template ID.
@@ -31,118 +34,108 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
   timeZone:
-    description: The timezone of the configuration template. For a list of allowed timezones,
-      please see the 'TZ' column in the table in <a target='_blank' href='https //en.wikipedia.org/wiki/List_of_tz_...
-      article</a>. Not applicable if copying from existing network or template.
+    description: The timezone of the configuration template. For a list of allowed
+      timezones, please see the 'TZ' column in the table in <a target='_blank' href='https
+      //en.wikipedia.org/wiki/List_of_tz_... article</a>. Not applicable if copying
+      from existing network or template.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationConfigTemplate
-  description: Complete reference of the createOrganizationConfigTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-config-template
-- name: Cisco Meraki documentation for organizations deleteOrganizationConfigTemplate
-  description: Complete reference of the deleteOrganizationConfigTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-config-template
-- name: Cisco Meraki documentation for organizations updateOrganizationConfigTemplate
-  description: Complete reference of the updateOrganizationConfigTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-config-template
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_config_template,
-    organizations.Organizations.delete_organization_config_template,
-    organizations.Organizations.update_organization_config_template,
-
-  - Paths used are
-    post /organizations/{organizationId}/configTemplates,
-    delete /organizations/{organizationId}/configTemplates/{configTemplateId},
-    put /organizations/{organizationId}/configTemplates/{configTemplateId},
+  - description: Complete reference of the createOrganizationConfigTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-config-template
+    name: Cisco Meraki documentation for organizations createOrganizationConfigTemplate
+  - description: Complete reference of the deleteOrganizationConfigTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-config-template
+    name: Cisco Meraki documentation for organizations deleteOrganizationConfigTemplate
+  - description: Complete reference of the updateOrganizationConfigTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-config-template
+    name: Cisco Meraki documentation for organizations updateOrganizationConfigTemplate
+short_description: Resource module for organizations _config _templates
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_config_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     copyFromNetworkId: N_24329156
     name: My config template
     organizationId: string
     timeZone: America/Los_Angeles
-
 - name: Delete by id
   cisco.meraki.organizations_config_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     configTemplateId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_config_templates:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     configTemplateId: string
     name: My config template
     organizationId: string
     timeZone: America/Los_Angeles
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_config_templates_info.py b/plugins/modules/organizations_config_templates_info.py
index 37f44f20a..61f2138bd 100644
--- a/plugins/modules/organizations_config_templates_info.py
+++ b/plugins/modules/organizations_config_templates_info.py
@@ -5,102 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_config_templates_info
-short_description: Information module for organizations _config _templates
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _config _templates.
-- Get organizations _config _templates by id.
-- List the configuration templates for this organization.
-- Return a single configuration template.
-version_added: '2.16.0'
+  - Get all organizations _config _templates.
+  - Get organizations _config _templates by id.
+  - List the configuration templates for this organization.
+  - Return a single configuration template.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_config_templates_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_config_template,
+    organizations.Organizations.get_organization_config_templates,
+  - Paths used are get /organizations/{organizationId}/configTemplates, get /organizations/{organizationId}/configTemplates/{configTemplateId},
 options:
+  configTemplateId:
+    description:
+      - ConfigTemplateId path parameter. Config template ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  configTemplateId:
-    description:
-    - ConfigTemplateId path parameter. Config template ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationConfigTemplate
-  description: Complete reference of the getOrganizationConfigTemplate API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template
-- name: Cisco Meraki documentation for organizations getOrganizationConfigTemplates
-  description: Complete reference of the getOrganizationConfigTemplates API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-templates
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_config_template,
-    organizations.Organizations.get_organization_config_templates,
-
-  - Paths used are
-    get /organizations/{organizationId}/configTemplates,
-    get /organizations/{organizationId}/configTemplates/{configTemplateId},
+  - description: Complete reference of the getOrganizationConfigTemplate API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template
+    name: Cisco Meraki documentation for organizations getOrganizationConfigTemplate
+  - description: Complete reference of the getOrganizationConfigTemplates API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-templates
+    name: Cisco Meraki documentation for organizations getOrganizationConfigTemplates
+short_description: Information module for organizations _config _templates
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _config _templates
   cisco.meraki.organizations_config_templates_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _config _templates by id
   cisco.meraki.organizations_config_templates_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     configTemplateId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_config_templates_switch_profiles_info.py b/plugins/modules/organizations_config_templates_switch_profiles_info.py
index d492fb055..4e7b21ca4 100644
--- a/plugins/modules/organizations_config_templates_switch_profiles_info.py
+++ b/plugins/modules/organizations_config_templates_switch_profiles_info.py
@@ -5,70 +5,67 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_config_templates_switch_profiles_info
-short_description: Information module for organizations _config _templates _switch _profiles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _config _templates _switch _profiles.
-- List the switch templates for your switch template configuration.
-version_added: '2.16.0'
+  - Get all organizations _config _templates _switch _profiles.
+  - List the switch templates for your switch template configuration.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_config_templates_switch_profiles_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_config_template_switch_profiles,
+  - Paths used are get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles,
 options:
+  configTemplateId:
+    description:
+      - ConfigTemplateId path parameter. Config template ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  configTemplateId:
-    description:
-    - ConfigTemplateId path parameter. Config template ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfiles
-  description: Complete reference of the getOrganizationConfigTemplateSwitchProfiles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profiles
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_config_template_switch_profiles,
-
-  - Paths used are
-    get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles,
+  - description: Complete reference of the getOrganizationConfigTemplateSwitchProfiles
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profiles
+    name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfiles
+short_description: Information module for organizations _config _templates _switch
+  _profiles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _config _templates _switch _profiles
   cisco.meraki.organizations_config_templates_switch_profiles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     configTemplateId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_config_templates_switch_profiles_ports.py b/plugins/modules/organizations_config_templates_switch_profiles_ports.py
index 9e50949ce..2e83bfe7b 100644
--- a/plugins/modules/organizations_config_templates_switch_profiles_ports.py
+++ b/plugins/modules/organizations_config_templates_switch_profiles_ports.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_config_templates_switch_profiles_ports
-short_description: Resource module for organizations _config _templates _switch _profiles _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _config _templates _switch _profiles _ports.
-- Update a switch template port.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _config _templates _switch
+    _profiles _ports.
+  - Update a switch template port.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_config_templates_switch_profiles_ports
+notes:
+  - SDK Method used are switch.Switch.update_organization_config_template_switch_profile_port,
+  - Paths used are put /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports/{portId},
 options:
   accessPolicyNumber:
     description: The number of a custom access policy to configure on the switch template
@@ -26,8 +27,8 @@
       or 'Sticky MAC allow list'.
     type: str
   allowedVlans:
-    description: The VLANs allowed on the switch template port. Only applicable to trunk
-      ports.
+    description: The VLANs allowed on the switch template port. Only applicable to
+      trunk ports.
     type: str
   configTemplateId:
     description: ConfigTemplateId path parameter. Config template ID.
@@ -57,9 +58,9 @@
     description: The link speed for the switch template port.
     type: str
   macAllowList:
-    description: Only devices with MAC addresses specified in this list will have access
-      to this port. Up to 20 MAC addresses can be defined. Only applicable when 'accessPolicyType'
-      is 'MAC allow list'.
+    description: Only devices with MAC addresses specified in this list will have
+      access to this port. Up to 20 MAC addresses can be defined. Only applicable
+      when 'accessPolicyType' is 'MAC allow list'.
     elements: str
     type: list
   name:
@@ -75,17 +76,19 @@
     description: PortId path parameter. Port ID.
     type: str
   portScheduleId:
-    description: The ID of the port schedule. A value of null will clear the port schedule.
+    description: The ID of the port schedule. A value of null will clear the port
+      schedule.
     type: str
   profile:
     description: Profile attributes.
     suboptions:
       enabled:
-        description: When enabled, override this port's configuration with a port profile.
+        description: When enabled, override this port's configuration with a port
+          profile.
         type: bool
       id:
-        description: When enabled, the ID of the port profile used to override the port's
-          configuration.
+        description: When enabled, the ID of the port profile used to override the
+          port's configuration.
         type: str
       iname:
         description: When enabled, the IName of the profile.
@@ -98,8 +101,8 @@
     description: The rapid spanning tree protocol status.
     type: bool
   stickyMacAllowList:
-    description: The initial list of MAC addresses for sticky Mac allow list. Only applicable
-      when 'accessPolicyType' is 'Sticky MAC allow list'.
+    description: The initial list of MAC addresses for sticky Mac allow list. Only
+      applicable when 'accessPolicyType' is 'Sticky MAC allow list'.
     elements: str
     type: list
   stickyMacAllowListLimit:
@@ -133,43 +136,41 @@
       ports.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch updateOrganizationConfigTemplateSwitchProfilePort
-  description: Complete reference of the updateOrganizationConfigTemplateSwitchProfilePort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-config-template-switch-profile-port
-notes:
-  - SDK Method used are
-    switch.Switch.update_organization_config_template_switch_profile_port,
-
-  - Paths used are
-    put /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports/{portId},
+  - description: Complete reference of the updateOrganizationConfigTemplateSwitchProfilePort
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-config-template-switch-profile-port
+    name: Cisco Meraki documentation for switch updateOrganizationConfigTemplateSwitchProfilePort
+short_description: Resource module for organizations _config _templates _switch _profiles
+  _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.organizations_config_templates_switch_profiles_ports:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accessPolicyNumber: 2
     accessPolicyType: Sticky MAC allow list
@@ -183,8 +184,8 @@
     isolationEnabled: false
     linkNegotiation: Auto negotiate
     macAllowList:
-    - 34:56:fe:ce:8e:a0
-    - 34:56:fe:ce:8e:a1
+      - 34:56:fe:ce:8e:a0
+      - 34:56:fe:ce:8e:a1
     name: My switch port
     organizationId: string
     poeEnabled: true
@@ -197,19 +198,18 @@
     profileId: string
     rstpEnabled: true
     stickyMacAllowList:
-    - 34:56:fe:ce:8e:b0
-    - 34:56:fe:ce:8e:b1
+      - 34:56:fe:ce:8e:b0
+      - 34:56:fe:ce:8e:b1
     stickyMacAllowListLimit: 5
     stormControlEnabled: true
     stpGuard: disabled
     tags:
-    - tag1
-    - tag2
+      - tag1
+      - tag2
     type: access
     udld: Alert only
     vlan: 10
     voiceVlan: 20
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_config_templates_switch_profiles_ports_info.py b/plugins/modules/organizations_config_templates_switch_profiles_ports_info.py
index dcae3fcaa..cadb3a08d 100644
--- a/plugins/modules/organizations_config_templates_switch_profiles_ports_info.py
+++ b/plugins/modules/organizations_config_templates_switch_profiles_ports_info.py
@@ -5,114 +5,111 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_config_templates_switch_profiles_ports_info
-short_description: Information module for organizations _config _templates _switch _profiles _ports
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _config _templates _switch _profiles _ports.
-- Get organizations _config _templates _switch _profiles _ports by id.
-- Return a switch template port.
-- Return all the ports of a switch template.
-version_added: '2.16.0'
+  - Get all organizations _config _templates _switch _profiles _ports.
+  - Get organizations _config _templates _switch _profiles _ports by id.
+  - Return a switch template port.
+  - Return all the ports of a switch template.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_config_templates_switch_profiles_ports_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_config_template_switch_profile_port,
+    switch.Switch.get_organization_config_template_switch_profile_ports,
+  - Paths used are get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports,
+    get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports/{portId},
 options:
+  configTemplateId:
+    description:
+      - ConfigTemplateId path parameter. Config template ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  configTemplateId:
+  portId:
     description:
-    - ConfigTemplateId path parameter. Config template ID.
+      - PortId path parameter. Port ID.
     type: str
   profileId:
     description:
-    - ProfileId path parameter. Profile ID.
-    type: str
-  portId:
-    description:
-    - PortId path parameter. Port ID.
+      - ProfileId path parameter. Profile ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfilePort
-  description: Complete reference of the getOrganizationConfigTemplateSwitchProfilePort API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profile-port
-- name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfilePorts
-  description: Complete reference of the getOrganizationConfigTemplateSwitchProfilePorts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profile-ports
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_config_template_switch_profile_port,
-    switch.Switch.get_organization_config_template_switch_profile_ports,
-
-  - Paths used are
-    get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports,
-    get /organizations/{organizationId}/configTemplates/{configTemplateId}/switch/profiles/{profileId}/ports/{portId},
+  - description: Complete reference of the getOrganizationConfigTemplateSwitchProfilePort
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profile-port
+    name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfilePort
+  - description: Complete reference of the getOrganizationConfigTemplateSwitchProfilePorts
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-config-template-switch-profile-ports
+    name: Cisco Meraki documentation for switch getOrganizationConfigTemplateSwitchProfilePorts
+short_description: Information module for organizations _config _templates _switch
+  _profiles _ports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _config _templates _switch _profiles _ports
   cisco.meraki.organizations_config_templates_switch_profiles_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     configTemplateId: string
     profileId: string
   register: result
-
 - name: Get organizations _config _templates _switch _profiles _ports by id
   cisco.meraki.organizations_config_templates_switch_profiles_ports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     configTemplateId: string
     profileId: string
     portId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_availabilities_change_history_info.py b/plugins/modules/organizations_devices_availabilities_change_history_info.py
index 122eb6667..b45d9222d 100644
--- a/plugins/modules/organizations_devices_availabilities_change_history_info.py
+++ b/plugins/modules/organizations_devices_availabilities_change_history_info.py
@@ -5,116 +5,129 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_availabilities_change_history_info
-short_description: Information module for organizations _devices _availabilities _change _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _availabilities _change _history.
-- List the availability history information for devices in an organization.
-version_added: '2.16.0'
+  - Get all organizations _devices _availabilities _change _history.
+  - List the availability history information for devices in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_availabilities_change_history_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_availabilities_change_history,
+  - Paths used are get /organizations/{organizationId}/devices/availabilities/changeHistory,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter device availabilities
+        history by network IDs.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
+  productTypes:
+    description:
+      - ProductTypes query parameter. Optional parameter to filter device availabilities
+        history by device product types.
+    elements: str
+    type: list
+  serials:
+    description:
+      - Serials query parameter. Optional parameter to filter device availabilities
+        history by device serial numbers.
+    elements: str
+    type: list
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  endingBefore:
+  statuses:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
+      - Statuses query parameter. Optional parameter to filter device availabilities
+        history by device statuses.
+    elements: str
+    type: list
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 1 day.
+
+        '
     type: float
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter device availabilities history by device serial numbers.
-    elements: str
-    type: list
-  productTypes:
-    description:
-    - ProductTypes query parameter. Optional parameter to filter device availabilities history by device product types.
-    elements: str
-    type: list
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter device availabilities history by network IDs.
-    elements: str
-    type: list
-  statuses:
-    description:
-    - Statuses query parameter. Optional parameter to filter device availabilities history by device statuses.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesAvailabilitiesChangeHistory
-  description: Complete reference of the getOrganizationDevicesAvailabilitiesChangeHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-availabilities-change-history
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_availabilities_change_history,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/availabilities/changeHistory,
+  - description: Complete reference of the getOrganizationDevicesAvailabilitiesChangeHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-availabilities-change-history
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesAvailabilitiesChangeHistory
+short_description: Information module for organizations _devices _availabilities _change
+  _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _availabilities _change _history
   cisco.meraki.organizations_devices_availabilities_change_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -129,7 +142,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_availabilities_info.py b/plugins/modules/organizations_devices_availabilities_info.py
index 0442f1996..6f1343633 100644
--- a/plugins/modules/organizations_devices_availabilities_info.py
+++ b/plugins/modules/organizations_devices_availabilities_info.py
@@ -5,127 +5,139 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_availabilities_info
-short_description: Information module for organizations _devices _availabilities
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _availabilities.
-- >
-   List the availability information for devices in an organization. The data returned by this endpoint is updated
-   every 5 minutes.
-version_added: '2.16.0'
+  - Get all organizations _devices _availabilities.
+  - 'List the availability information for devices in an organization. The data returned
+    by this endpoint is updated every 5 minutes.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_availabilities_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_availabilities,
+  - Paths used are get /organizations/{organizationId}/devices/availabilities,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. Optional parameter to filter device availabilities
+        by network ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
+  productTypes:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter device availabilities by network ID. This filter
-      uses multiple exact matches.
+      - 'ProductTypes query parameter. Optional parameter to filter device availabilities
+        by device product types. This filter uses multiple exact matches. Valid types
+        are wireless, appliance, switch, camera, cellularGateway, sensor, wirelessController,
+        and campusGateway.
+
+        '
     elements: str
     type: list
-  productTypes:
+  serials:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter device availabilities by device product types.
-      This filter uses multiple exact matches. Valid types are wireless, appliance, switch, camera,
-      cellularGateway, sensor, wirelessController, and campusGateway.
+      - 'Serials query parameter. Optional parameter to filter device availabilities
+        by device serial numbers. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  serials:
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  statuses:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter device availabilities by device serial numbers. This
-      filter uses multiple exact matches.
+      - 'Statuses query parameter. Optional parameter to filter device availabilities
+        by device status. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   tags:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter devices by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below). This filter uses multiple exact
-      matches.
+      - 'Tags query parameter. An optional parameter to filter devices by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below). This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   tagsFilterType:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return devices which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return devices which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
-  statuses:
-    description:
-    - >
-      Statuses query parameter. Optional parameter to filter device availabilities by device status. This filter
-      uses multiple exact matches.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesAvailabilities
-  description: Complete reference of the getOrganizationDevicesAvailabilities API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-availabilities
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_availabilities,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/availabilities,
+  - description: Complete reference of the getOrganizationDevicesAvailabilities API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-availabilities
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesAvailabilities
+short_description: Information module for organizations _devices _availabilities
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _availabilities
   cisco.meraki.organizations_devices_availabilities_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -139,7 +151,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_details_bulk_update.py b/plugins/modules/organizations_devices_details_bulk_update.py
index a5224f95c..d56df8df8 100644
--- a/plugins/modules/organizations_devices_details_bulk_update.py
+++ b/plugins/modules/organizations_devices_details_bulk_update.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_details_bulk_update
-short_description: Resource module for organizations _devices _details _bulk _update
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _devices _details _bulk _update.
-- Updating device details currently only used for Catalyst devices .
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _devices _details _bulk
+    _update.
+  - Updating device details currently only used for Catalyst devices .
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_details_bulk_update
+notes:
+  - SDK Method used are organizations.Organizations.bulk_update_organization_devices_details,
+  - Paths used are post /organizations/{organizationId}/devices/details/bulkUpdate,
 options:
   details:
     description: An array of details.
@@ -35,56 +36,51 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations bulkUpdateOrganizationDevicesDetails
-  description: Complete reference of the bulkUpdateOrganizationDevicesDetails API.
-  link: https://developer.cisco.com/meraki/api-v1/#!bulk-update-organization-devices-details
-notes:
-  - SDK Method used are
-    organizations.Organizations.bulk_update_organization_devices_details,
-
-  - Paths used are
-    post /organizations/{organizationId}/devices/details/bulkUpdate,
+  - description: Complete reference of the bulkUpdateOrganizationDevicesDetails API.
+    link: https://developer.cisco.com/meraki/api-v1/#!bulk-update-organization-devices-details
+    name: Cisco Meraki documentation for organizations bulkUpdateOrganizationDevicesDetails
+short_description: Resource module for organizations _devices _details _bulk _update
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_devices_details_bulk_update:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     details:
-    - name: username
-      value: ABC
-    - name: password
-      value: ABC123
-    - name: enable password
-      value: ABC123
+      - name: username
+        value: ABC
+      - name: password
+        value: ABC123
+      - name: enable password
+        value: ABC123
     organizationId: string
     serials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_info.py b/plugins/modules/organizations_devices_info.py
index 50647d15c..0e43e75de 100644
--- a/plugins/modules/organizations_devices_info.py
+++ b/plugins/modules/organizations_devices_info.py
@@ -5,171 +5,192 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_info
-short_description: Information module for organizations _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices.
-- List the devices in an organization that have been assigned to a network.
-version_added: '2.16.0'
+  - Get all organizations _devices.
+  - List the devices in an organization that have been assigned to a network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices,
+  - Paths used are get /organizations/{organizationId}/devices,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Filter results by whether or not
+        the device''s configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  configurationUpdatedAfter:
+  headers:
+    description: Additional headers.
+    type: dict
+  mac:
     description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Filter results by whether or not the device's configuration has
-      been updated after the given timestamp.
+      - 'Mac query parameter. Optional parameter to filter devices by MAC address.
+        All returned devices will have a MAC address that contains the search term
+        or is an exact match.
+
+        '
     type: str
-  networkIds:
+  macs:
     description:
-    - NetworkIds query parameter. Optional parameter to filter devices by network.
+      - 'Macs query parameter. Optional parameter to filter devices by one or more
+        MAC addresses. All returned devices will have a MAC address that is an exact
+        match.
+
+        '
     elements: str
     type: list
-  productTypes:
+  model:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter devices by product type. Valid types are
-      wireless, appliance, switch, systemsManager, camera, cellularGateway, sensor, wirelessController, and
-      secureConnect.
-    elements: str
-    type: list
-  tags:
+      - 'Model query parameter. Optional parameter to filter devices by model. All
+        returned devices will have a model that contains the search term or is an
+        exact match.
+
+        '
+    type: str
+  models:
     description:
-    - Tags query parameter. Optional parameter to filter devices by tags.
+      - 'Models query parameter. Optional parameter to filter devices by one or more
+        models. All returned devices will have a model that is an exact match.
+
+        '
     elements: str
     type: list
-  tagsFilterType:
-    description:
-    - >
-      TagsFilterType query parameter. Optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return networks which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
-    type: str
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter devices by name. All returned devices will have a name
-      that contains the search term or is an exact match.
+      - 'Name query parameter. Optional parameter to filter devices by name. All returned
+        devices will have a name that contains the search term or is an exact match.
+
+        '
     type: str
-  mac:
+  networkIds:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter devices by MAC address. All returned devices will have a
-      MAC address that contains the search term or is an exact match.
-    type: str
-  serial:
+      - NetworkIds query parameter. Optional parameter to filter devices by network.
+    elements: str
+    type: list
+  organizationId:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter devices by serial number. All returned devices will
-      have a serial number that contains the search term or is an exact match.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  model:
+  perPage:
     description:
-    - >
-      Model query parameter. Optional parameter to filter devices by model. All returned devices will have a model
-      that contains the search term or is an exact match.
-    type: str
-  macs:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  productTypes:
     description:
-    - >
-      Macs query parameter. Optional parameter to filter devices by one or more MAC addresses. All returned
-      devices will have a MAC address that is an exact match.
+      - 'ProductTypes query parameter. Optional parameter to filter devices by product
+        type. Valid types are wireless, appliance, switch, systemsManager, camera,
+        cellularGateway, sensor, wirelessController, and secureConnect.
+
+        '
     elements: str
     type: list
-  serials:
+  sensorAlertProfileIds:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter devices by one or more serial numbers. All returned
-      devices will have a serial number that is an exact match.
+      - 'SensorAlertProfileIds query parameter. Optional parameter to filter devices
+        by the alert profiles that are bound to them. Only applies to sensor devices.
+
+        '
     elements: str
     type: list
   sensorMetrics:
     description:
-    - >
-      SensorMetrics query parameter. Optional parameter to filter devices by the metrics that they provide. Only
-      applies to sensor devices.
+      - 'SensorMetrics query parameter. Optional parameter to filter devices by the
+        metrics that they provide. Only applies to sensor devices.
+
+        '
     elements: str
     type: list
-  sensorAlertProfileIds:
+  serial:
+    description:
+      - 'Serial query parameter. Optional parameter to filter devices by serial number.
+        All returned devices will have a serial number that contains the search term
+        or is an exact match.
+
+        '
+    type: str
+  serials:
     description:
-    - >
-      SensorAlertProfileIds query parameter. Optional parameter to filter devices by the alert profiles that are
-      bound to them. Only applies to sensor devices.
+      - 'Serials query parameter. Optional parameter to filter devices by one or more
+        serial numbers. All returned devices will have a serial number that is an
+        exact match.
+
+        '
     elements: str
     type: list
-  models:
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  tags:
     description:
-    - >
-      Models query parameter. Optional parameter to filter devices by one or more models. All returned devices
-      will have a model that is an exact match.
+      - Tags query parameter. Optional parameter to filter devices by tags.
     elements: str
     type: list
+  tagsFilterType:
+    description:
+      - 'TagsFilterType query parameter. Optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return networks which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevices
-  description: Complete reference of the getOrganizationDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices,
+  - description: Complete reference of the getOrganizationDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices
+    name: Cisco Meraki documentation for organizations getOrganizationDevices
+short_description: Information module for organizations _devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices
   cisco.meraki.organizations_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -191,7 +212,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_overview_by_model_info.py b/plugins/modules/organizations_devices_overview_by_model_info.py
index b90310629..9cbe9aa9c 100644
--- a/plugins/modules/organizations_devices_overview_by_model_info.py
+++ b/plugins/modules/organizations_devices_overview_by_model_info.py
@@ -5,87 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_overview_by_model_info
-short_description: Information module for organizations _devices _overview _by _model
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _overview _by _model.
-- Lists the count for each device model.
-version_added: '2.20.0'
+  - Get all organizations _devices _overview _by _model.
+  - Lists the count for each device model.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_overview_by_model_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_overview_by_model,
+  - Paths used are get /organizations/{organizationId}/devices/overview/byModel,
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   models:
     description:
-    - >
-      Models query parameter. Optional parameter to filter devices by one or more models. All returned devices
-      will have a model that is an exact match.
+      - 'Models query parameter. Optional parameter to filter devices by one or more
+        models. All returned devices will have a model that is an exact match.
+
+        '
     elements: str
     type: list
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter devices by networkId.
+      - NetworkIds query parameter. Optional parameter to filter devices by networkId.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   productTypes:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter device by device product types. This filter uses
-      multiple exact matches.
+      - 'ProductTypes query parameter. Optional parameter to filter device by device
+        product types. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesOverviewByModel
-  description: Complete reference of the getOrganizationDevicesOverviewByModel API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-overview-by-model
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_overview_by_model,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/overview/byModel,
+  - description: Complete reference of the getOrganizationDevicesOverviewByModel API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-overview-by-model
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesOverviewByModel
+short_description: Information module for organizations _devices _overview _by _model
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _overview _by _model
   cisco.meraki.organizations_devices_overview_by_model_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     models: []
     networkIds: []
     productTypes: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_power_modules_statuses_by_device_info.py b/plugins/modules/organizations_devices_power_modules_statuses_by_device_info.py
index f7b0dc7e3..65cbc722f 100644
--- a/plugins/modules/organizations_devices_power_modules_statuses_by_device_info.py
+++ b/plugins/modules/organizations_devices_power_modules_statuses_by_device_info.py
@@ -5,119 +5,132 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_power_modules_statuses_by_device_info
-short_description: Information module for organizations _devices _power _modules _statuses _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _power _modules _statuses _by _device.
-- >
-   List the most recent status information for power modules in rackmount MX and MS devices that support them. The
-   data returned by this endpoint is updated every 5 minutes.
-version_added: '2.16.0'
+  - Get all organizations _devices _power _modules _statuses _by _device.
+  - 'List the most recent status information for power modules in rackmount MX and
+    MS devices that support them. The data returned by this endpoint is updated every
+    5 minutes.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_power_modules_statuses_by_device_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_power_modules_statuses_by_device,
+  - Paths used are get /organizations/{organizationId}/devices/powerModules/statuses/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. Optional parameter to filter device availabilities
+        by network ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter device availabilities by network ID. This filter
-      uses multiple exact matches.
-    elements: str
-    type: list
   productTypes:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter device availabilities by device product types.
-      This filter uses multiple exact matches.
+      - 'ProductTypes query parameter. Optional parameter to filter device availabilities
+        by device product types. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter device availabilities by device serial numbers. This
-      filter uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter device availabilities
+        by device serial numbers. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   tags:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter devices by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below). This filter uses multiple exact
-      matches.
+      - 'Tags query parameter. An optional parameter to filter devices by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below). This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   tagsFilterType:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return devices which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return devices which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesPowerModulesStatusesByDevice
-  description: Complete reference of the getOrganizationDevicesPowerModulesStatusesByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-power-modules-statuses-by-device
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_power_modules_statuses_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/powerModules/statuses/byDevice,
+  - description: Complete reference of the getOrganizationDevicesPowerModulesStatusesByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-power-modules-statuses-by-device
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesPowerModulesStatusesByDevice
+short_description: Information module for organizations _devices _power _modules _statuses
+  _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _power _modules _statuses _by _device
   cisco.meraki.organizations_devices_power_modules_statuses_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -130,7 +143,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_provisioning_statuses_info.py b/plugins/modules/organizations_devices_provisioning_statuses_info.py
index 11f37ad66..a5c2a4b38 100644
--- a/plugins/modules/organizations_devices_provisioning_statuses_info.py
+++ b/plugins/modules/organizations_devices_provisioning_statuses_info.py
@@ -5,123 +5,134 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_provisioning_statuses_info
-short_description: Information module for organizations _devices _provisioning _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _provisioning _statuses.
-- List the provisioning statuses information for devices in an organization.
-version_added: '2.16.0'
+  - Get all organizations _devices _provisioning _statuses.
+  - List the provisioning statuses information for devices in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_provisioning_statuses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_provisioning_statuses,
+  - Paths used are get /organizations/{organizationId}/devices/provisioning/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. Optional parameter to filter device by network
+        ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter device by network ID. This filter uses multiple
-      exact matches.
-    elements: str
-    type: list
   productTypes:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter device by device product types. This filter uses
-      multiple exact matches.
+      - 'ProductTypes query parameter. Optional parameter to filter device by device
+        product types. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter device by device serial numbers. This filter uses
-      multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter device by device serial
+        numbers. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   status:
     description:
-    - >
-      Status query parameter. An optional parameter to filter devices by the provisioning status. Accepted
-      statuses unprovisioned, incomplete, complete.
+      - 'Status query parameter. An optional parameter to filter devices by the provisioning
+        status. Accepted statuses unprovisioned, incomplete, complete.
+
+        '
     type: str
   tags:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter devices by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below). This filter uses multiple exact
-      matches.
+      - 'Tags query parameter. An optional parameter to filter devices by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below). This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   tagsFilterType:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return devices which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return devices which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesProvisioningStatuses
-  description: Complete reference of the getOrganizationDevicesProvisioningStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-provisioning-statuses
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_provisioning_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/provisioning/statuses,
+  - description: Complete reference of the getOrganizationDevicesProvisioningStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-provisioning-statuses
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesProvisioningStatuses
+short_description: Information module for organizations _devices _provisioning _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _provisioning _statuses
   cisco.meraki.organizations_devices_provisioning_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -135,7 +146,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_statuses_info.py b/plugins/modules/organizations_devices_statuses_info.py
index b91d7bcd2..1fa6bae0d 100644
--- a/plugins/modules/organizations_devices_statuses_info.py
+++ b/plugins/modules/organizations_devices_statuses_info.py
@@ -5,125 +5,135 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_statuses_info
-short_description: Information module for organizations _devices _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _statuses.
-- List the status of every Meraki device in the organization.
-version_added: '2.16.0'
+  - Get all organizations _devices _statuses.
+  - List the status of every Meraki device in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_statuses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_statuses,
+  - Paths used are get /organizations/{organizationId}/devices/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  models:
+    description:
+      - Models query parameter. Optional parameter to filter devices by models.
+    elements: str
+    type: list
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter devices by network
+        ids.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
+  productTypes:
     description:
-    - NetworkIds query parameter. Optional parameter to filter devices by network ids.
+      - 'ProductTypes query parameter. An optional parameter to filter device statuses
+        by product type. Valid types are wireless, appliance, switch, systemsManager,
+        camera, cellularGateway, sensor, wirelessController, and secureConnect.
+
+        '
     elements: str
     type: list
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter devices by serials.
-    elements: str
-    type: list
-  statuses:
-    description:
-    - >
-      Statuses query parameter. Optional parameter to filter devices by statuses. Valid statuses are "online",
-      "alerting", "offline", "dormant".
+      - Serials query parameter. Optional parameter to filter devices by serials.
     elements: str
     type: list
-  productTypes:
+  startingAfter:
     description:
-    - >
-      ProductTypes query parameter. An optional parameter to filter device statuses by product type. Valid types
-      are wireless, appliance, switch, systemsManager, camera, cellularGateway, sensor, wirelessController, and
-      secureConnect.
-    elements: str
-    type: list
-  models:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  statuses:
     description:
-    - Models query parameter. Optional parameter to filter devices by models.
+      - 'Statuses query parameter. Optional parameter to filter devices by statuses.
+        Valid statuses are "online", "alerting", "offline", "dormant".
+
+        '
     elements: str
     type: list
   tags:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter devices by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below).
+      - 'Tags query parameter. An optional parameter to filter devices by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below).
+
+        '
     elements: str
     type: list
   tagsFilterType:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return devices which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return devices which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesStatuses
-  description: Complete reference of the getOrganizationDevicesStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-statuses
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/statuses,
+  - description: Complete reference of the getOrganizationDevicesStatuses API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-statuses
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesStatuses
+short_description: Information module for organizations _devices _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _statuses
   cisco.meraki.organizations_devices_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -138,7 +148,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_statuses_overview_info.py b/plugins/modules/organizations_devices_statuses_overview_info.py
index 11a32f110..1e2448144 100644
--- a/plugins/modules/organizations_devices_statuses_overview_info.py
+++ b/plugins/modules/organizations_devices_statuses_overview_info.py
@@ -5,80 +5,78 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_statuses_overview_info
-short_description: Information module for organizations _devices _statuses _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _statuses _overview.
-- Return an overview of current device statuses.
-version_added: '2.16.0'
+  - Get all organizations _devices _statuses _overview.
+  - Return an overview of current device statuses.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_statuses_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_statuses_overview,
+  - Paths used are get /organizations/{organizationId}/devices/statuses/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. An optional parameter to filter device statuses
+        by network.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   productTypes:
     description:
-    - >
-      ProductTypes query parameter. An optional parameter to filter device statuses by product type. Valid types
-      are wireless, appliance, switch, systemsManager, camera, cellularGateway, sensor, wirelessController, and
-      secureConnect.
-    elements: str
-    type: list
-  networkIds:
-    description:
-    - NetworkIds query parameter. An optional parameter to filter device statuses by network.
+      - 'ProductTypes query parameter. An optional parameter to filter device statuses
+        by product type. Valid types are wireless, appliance, switch, systemsManager,
+        camera, cellularGateway, sensor, wirelessController, and secureConnect.
+
+        '
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesStatusesOverview
-  description: Complete reference of the getOrganizationDevicesStatusesOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-statuses-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_statuses_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/statuses/overview,
+  - description: Complete reference of the getOrganizationDevicesStatusesOverview
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-statuses-overview
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesStatusesOverview
+short_description: Information module for organizations _devices _statuses _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _statuses _overview
   cisco.meraki.organizations_devices_statuses_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     productTypes: []
     networkIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_uplinks_addresses_by_device_info.py b/plugins/modules/organizations_devices_uplinks_addresses_by_device_info.py
index ca4849184..b288e0d6b 100644
--- a/plugins/modules/organizations_devices_uplinks_addresses_by_device_info.py
+++ b/plugins/modules/organizations_devices_uplinks_addresses_by_device_info.py
@@ -5,117 +5,128 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_uplinks_addresses_by_device_info
-short_description: Information module for organizations _devices _uplinks _addresses _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _uplinks _addresses _by _device.
-- List the current uplink addresses for devices in an organization.
-version_added: '2.16.0'
+  - Get all organizations _devices _uplinks _addresses _by _device.
+  - List the current uplink addresses for devices in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_uplinks_addresses_by_device_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_uplinks_addresses_by_device,
+  - Paths used are get /organizations/{organizationId}/devices/uplinks/addresses/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. Optional parameter to filter device uplinks by
+        network ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter device uplinks by network ID. This filter uses
-      multiple exact matches.
-    elements: str
-    type: list
   productTypes:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter device uplinks by device product types. This
-      filter uses multiple exact matches.
+      - 'ProductTypes query parameter. Optional parameter to filter device uplinks
+        by device product types. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter device availabilities by device serial numbers. This
-      filter uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter device availabilities
+        by device serial numbers. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   tags:
     description:
-    - >
-      Tags query parameter. An optional parameter to filter devices by tags. The filtering is case-sensitive. If
-      tags are included, 'tagsFilterType' should also be included (see below). This filter uses multiple exact
-      matches.
+      - 'Tags query parameter. An optional parameter to filter devices by tags. The
+        filtering is case-sensitive. If tags are included, ''tagsFilterType'' should
+        also be included (see below). This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
   tagsFilterType:
     description:
-    - >
-      TagsFilterType query parameter. An optional parameter of value 'withAnyTags' or 'withAllTags' to indicate
-      whether to return devices which contain ANY or ALL of the included tags. If no type is included,
-      'withAnyTags' will be selected.
+      - 'TagsFilterType query parameter. An optional parameter of value ''withAnyTags''
+        or ''withAllTags'' to indicate whether to return devices which contain ANY
+        or ALL of the included tags. If no type is included, ''withAnyTags'' will
+        be selected.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesUplinksAddressesByDevice
-  description: Complete reference of the getOrganizationDevicesUplinksAddressesByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-uplinks-addresses-by-device
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_uplinks_addresses_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/uplinks/addresses/byDevice,
+  - description: Complete reference of the getOrganizationDevicesUplinksAddressesByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-uplinks-addresses-by-device
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesUplinksAddressesByDevice
+short_description: Information module for organizations _devices _uplinks _addresses
+  _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _uplinks _addresses _by _device
   cisco.meraki.organizations_devices_uplinks_addresses_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -128,7 +139,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_devices_uplinks_loss_and_latency_info.py b/plugins/modules/organizations_devices_uplinks_loss_and_latency_info.py
index ecbab41d0..e063e404e 100644
--- a/plugins/modules/organizations_devices_uplinks_loss_and_latency_info.py
+++ b/plugins/modules/organizations_devices_uplinks_loss_and_latency_info.py
@@ -5,89 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_devices_uplinks_loss_and_latency_info
-short_description: Information module for organizations _devices _uplinks _loss _and _latency
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _devices _uplinks _loss _and _latency.
-- Return the uplink loss and latency for every MX in the organization from at latest 2 minutes ago.
-version_added: '2.16.0'
+  - Get all organizations _devices _uplinks _loss _and _latency.
+  - Return the uplink loss and latency for every MX in the organization from at latest
+    2 minutes ago.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_devices_uplinks_loss_and_latency_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_devices_uplinks_loss_and_latency,
+  - Paths used are get /organizations/{organizationId}/devices/uplinksLossAndLatency,
 options:
   headers:
     description: Additional headers.
     type: dict
+  ip:
+    description:
+      - Ip query parameter. Optional filter for a specific destination IP. Default
+        will return all destination IPs.
+    type: str
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 60 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 60 days from today.
     type: str
   t1:
     description:
-    - >
-      T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 5 minutes after t0. The
-      latest possible time that t1 can be is 2 minutes into the past.
+      - 'T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 5 minutes after t0. The latest possible time that t1 can be is 2 minutes
+        into the past.
+
+        '
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 5 minutes. The
-      default is 5 minutes.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 5 minutes. The default
+        is 5 minutes.
+
+        '
     type: float
   uplink:
     description:
-    - >
-      Uplink query parameter. Optional filter for a specific WAN uplink. Valid uplinks are wan1, wan2, wan3,
-      cellular. Default will return all uplinks.
-    type: str
-  ip:
-    description:
-    - Ip query parameter. Optional filter for a specific destination IP. Default will return all destination IPs.
+      - 'Uplink query parameter. Optional filter for a specific WAN uplink. Valid
+        uplinks are wan1, wan2, wan3, cellular. Default will return all uplinks.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationDevicesUplinksLossAndLatency
-  description: Complete reference of the getOrganizationDevicesUplinksLossAndLatency API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-uplinks-loss-and-latency
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_devices_uplinks_loss_and_latency,
-
-  - Paths used are
-    get /organizations/{organizationId}/devices/uplinksLossAndLatency,
+  - description: Complete reference of the getOrganizationDevicesUplinksLossAndLatency
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-uplinks-loss-and-latency
+    name: Cisco Meraki documentation for organizations getOrganizationDevicesUplinksLossAndLatency
+short_description: Information module for organizations _devices _uplinks _loss _and
+  _latency
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _devices _uplinks _loss _and _latency
   cisco.meraki.organizations_devices_uplinks_loss_and_latency_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -95,7 +101,6 @@
     ip: string
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_early_access_features_info.py b/plugins/modules/organizations_early_access_features_info.py
index e0720cabb..068053998 100644
--- a/plugins/modules/organizations_early_access_features_info.py
+++ b/plugins/modules/organizations_early_access_features_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_early_access_features_info
-short_description: Information module for organizations _early _access _features
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _early _access _features.
-- List the available early access features for organization.
-version_added: '2.16.0'
+  - Get all organizations _early _access _features.
+  - List the available early access features for organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_early_access_features_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_early_access_features,
+  - Paths used are get /organizations/{organizationId}/earlyAccess/features,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeatures
-  description: Complete reference of the getOrganizationEarlyAccessFeatures API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_early_access_features,
-
-  - Paths used are
-    get /organizations/{organizationId}/earlyAccess/features,
+  - description: Complete reference of the getOrganizationEarlyAccessFeatures API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features
+    name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeatures
+short_description: Information module for organizations _early _access _features
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _early _access _features
   cisco.meraki.organizations_early_access_features_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_early_access_features_opt_ins.py b/plugins/modules/organizations_early_access_features_opt_ins.py
index e8185be33..8a3db5c13 100644
--- a/plugins/modules/organizations_early_access_features_opt_ins.py
+++ b/plugins/modules/organizations_early_access_features_opt_ins.py
@@ -5,18 +5,23 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_early_access_features_opt_ins
-short_description: Resource module for organizations _early _access _features _opt _ins
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _early _access _features _opt _ins.
-- Create a new early access feature opt-in for an organization.
-- Delete an early access feature opt-in.
-- Update an early access feature opt-in for an organization.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _early
+    _access _features _opt _ins.
+  - Create a new early access feature opt-in for an organization.
+  - Delete an early access feature opt-in.
+  - Update an early access feature opt-in for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_early_access_features_opt_ins
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_early_access_features_opt_in,
+    organizations.Organizations.delete_organization_early_access_features_opt_in,
+    organizations.Organizations.update_organization_early_access_features_opt_in,
+  - Paths used are post /organizations/{organizationId}/earlyAccess/features/optIns,
+    delete /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
+    put /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
 options:
   limitScopeToNetworks:
     description: A list of network IDs to apply the opt-in to.
@@ -32,113 +37,106 @@
     description: Short name of the early access feature.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationEarlyAccessFeaturesOptIn
-  description: Complete reference of the createOrganizationEarlyAccessFeaturesOptIn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-early-access-features-opt-in
-- name: Cisco Meraki documentation for organizations deleteOrganizationEarlyAccessFeaturesOptIn
-  description: Complete reference of the deleteOrganizationEarlyAccessFeaturesOptIn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-early-access-features-opt-in
-- name: Cisco Meraki documentation for organizations updateOrganizationEarlyAccessFeaturesOptIn
-  description: Complete reference of the updateOrganizationEarlyAccessFeaturesOptIn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-early-access-features-opt-in
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_early_access_features_opt_in,
-    organizations.Organizations.delete_organization_early_access_features_opt_in,
-    organizations.Organizations.update_organization_early_access_features_opt_in,
-
-  - Paths used are
-    post /organizations/{organizationId}/earlyAccess/features/optIns,
-    delete /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
-    put /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
+  - description: Complete reference of the createOrganizationEarlyAccessFeaturesOptIn
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-early-access-features-opt-in
+    name: Cisco Meraki documentation for organizations createOrganizationEarlyAccessFeaturesOptIn
+  - description: Complete reference of the deleteOrganizationEarlyAccessFeaturesOptIn
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-early-access-features-opt-in
+    name: Cisco Meraki documentation for organizations deleteOrganizationEarlyAccessFeaturesOptIn
+  - description: Complete reference of the updateOrganizationEarlyAccessFeaturesOptIn
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-early-access-features-opt-in
+    name: Cisco Meraki documentation for organizations updateOrganizationEarlyAccessFeaturesOptIn
+short_description: Resource module for organizations _early _access _features _opt
+  _ins
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_early_access_features_opt_ins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     limitScopeToNetworks:
-    - N_12345
+      - N_12345
     organizationId: string
     shortName: has_beta_api
-
 - name: Delete by id
   cisco.meraki.organizations_early_access_features_opt_ins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     optInId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_early_access_features_opt_ins:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     limitScopeToNetworks:
-    - N_12345
+      - N_12345
     optInId: string
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_early_access_features_opt_ins_info.py b/plugins/modules/organizations_early_access_features_opt_ins_info.py
index c998a612d..c98227f06 100644
--- a/plugins/modules/organizations_early_access_features_opt_ins_info.py
+++ b/plugins/modules/organizations_early_access_features_opt_ins_info.py
@@ -5,102 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_early_access_features_opt_ins_info
-short_description: Information module for organizations _early _access _features _opt _ins
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _early _access _features _opt _ins.
-- Get organizations _early _access _features _opt _ins by id.
-- List the early access feature opt-ins for an organization.
-- Show an early access feature opt-in for an organization.
-version_added: '2.16.0'
+  - Get all organizations _early _access _features _opt _ins.
+  - Get organizations _early _access _features _opt _ins by id.
+  - List the early access feature opt-ins for an organization.
+  - Show an early access feature opt-in for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_early_access_features_opt_ins_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_early_access_features_opt_in,
+    organizations.Organizations.get_organization_early_access_features_opt_ins,
+  - Paths used are get /organizations/{organizationId}/earlyAccess/features/optIns,
+    get /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  optInId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OptInId path parameter. Opt in ID.
     type: str
-  optInId:
+  organizationId:
     description:
-    - OptInId path parameter. Opt in ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeaturesOptIn
-  description: Complete reference of the getOrganizationEarlyAccessFeaturesOptIn API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features-opt-in
-- name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeaturesOptIns
-  description: Complete reference of the getOrganizationEarlyAccessFeaturesOptIns API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features-opt-ins
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_early_access_features_opt_in,
-    organizations.Organizations.get_organization_early_access_features_opt_ins,
-
-  - Paths used are
-    get /organizations/{organizationId}/earlyAccess/features/optIns,
-    get /organizations/{organizationId}/earlyAccess/features/optIns/{optInId},
+  - description: Complete reference of the getOrganizationEarlyAccessFeaturesOptIn
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features-opt-in
+    name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeaturesOptIn
+  - description: Complete reference of the getOrganizationEarlyAccessFeaturesOptIns
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-early-access-features-opt-ins
+    name: Cisco Meraki documentation for organizations getOrganizationEarlyAccessFeaturesOptIns
+short_description: Information module for organizations _early _access _features _opt
+  _ins
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _early _access _features _opt _ins
   cisco.meraki.organizations_early_access_features_opt_ins_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _early _access _features _opt _ins by id
   cisco.meraki.organizations_early_access_features_opt_ins_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     optInId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_firmware_upgrades_by_device_info.py b/plugins/modules/organizations_firmware_upgrades_by_device_info.py
index 252edc0f7..dd17b3833 100644
--- a/plugins/modules/organizations_firmware_upgrades_by_device_info.py
+++ b/plugins/modules/organizations_firmware_upgrades_by_device_info.py
@@ -5,114 +5,125 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_firmware_upgrades_by_device_info
-short_description: Information module for organizations _firmware _upgrades _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _firmware _upgrades _by _device.
-- Get firmware upgrade status for the filtered devices. This endpoint currently only supports Meraki switches.
-version_added: '2.16.0'
+  - Get all organizations _firmware _upgrades _by _device.
+  - Get firmware upgrade status for the filtered devices. This endpoint currently
+    only supports Meraki switches.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_firmware_upgrades_by_device_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_firmware_upgrades_by_device,
+  - Paths used are get /organizations/{organizationId}/firmware/upgrades/byDevice,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
-    type: int
-  startingAfter:
+  currentUpgradesOnly:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
+      - CurrentUpgradesOnly query parameter. Optional parameter to filter to only
+        current or pending upgrade statuses.
+    type: bool
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
+  firmwareUpgradeBatchIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter by network.
+      - FirmwareUpgradeBatchIds query parameter. Optional parameter to filter by firmware
+        upgrade batch ids.
     elements: str
     type: list
-  serials:
+  headers:
+    description: Additional headers.
+    type: dict
+  macs:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter by serial number. All returned devices will have a
-      serial number that is an exact match.
+      - 'Macs query parameter. Optional parameter to filter by one or more MAC addresses
+        belonging to devices. All devices returned belong to MAC addresses that are
+        an exact match.
+
+        '
     elements: str
     type: list
-  macs:
+  networkIds:
     description:
-    - >
-      Macs query parameter. Optional parameter to filter by one or more MAC addresses belonging to devices. All
-      devices returned belong to MAC addresses that are an exact match.
+      - NetworkIds query parameter. Optional parameter to filter by network.
     elements: str
     type: list
-  firmwareUpgradeBatchIds:
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
+    type: int
+  serials:
     description:
-    - FirmwareUpgradeBatchIds query parameter. Optional parameter to filter by firmware upgrade batch ids.
+      - 'Serials query parameter. Optional parameter to filter by serial number. All
+        returned devices will have a serial number that is an exact match.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   upgradeStatuses:
     description:
-    - UpgradeStatuses query parameter. Optional parameter to filter by firmware upgrade statuses.
+      - UpgradeStatuses query parameter. Optional parameter to filter by firmware
+        upgrade statuses.
     elements: str
     type: list
-  currentUpgradesOnly:
-    description:
-    - CurrentUpgradesOnly query parameter. Optional parameter to filter to only current or pending upgrade statuses.
-    type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationFirmwareUpgradesByDevice
-  description: Complete reference of the getOrganizationFirmwareUpgradesByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-firmware-upgrades-by-device
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_firmware_upgrades_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/firmware/upgrades/byDevice,
+  - description: Complete reference of the getOrganizationFirmwareUpgradesByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-firmware-upgrades-by-device
+    name: Cisco Meraki documentation for organizations getOrganizationFirmwareUpgradesByDevice
+short_description: Information module for organizations _firmware _upgrades _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _firmware _upgrades _by _device
   cisco.meraki.organizations_firmware_upgrades_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -121,12 +132,11 @@
     macs: []
     firmwareUpgradeBatchIds: []
     upgradeStatuses: []
-    currentUpgradesOnly: True
+    currentUpgradesOnly: true
     organizationId: string
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_firmware_upgrades_info.py b/plugins/modules/organizations_firmware_upgrades_info.py
index a907f20ed..e848f6e67 100644
--- a/plugins/modules/organizations_firmware_upgrades_info.py
+++ b/plugins/modules/organizations_firmware_upgrades_info.py
@@ -5,91 +5,95 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_firmware_upgrades_info
-short_description: Information module for organizations _firmware _upgrades
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _firmware _upgrades.
-- Get firmware upgrade information for an organization.
-version_added: '2.16.0'
+  - Get all organizations _firmware _upgrades.
+  - Get firmware upgrade information for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_firmware_upgrades_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_firmware_upgrades,
+  - Paths used are get /organizations/{organizationId}/firmware/upgrades,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  productTypes:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - ProductTypes query parameter. Optional parameter to filter the upgrade by
+        product type.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   status:
     description:
-    - Status query parameter. Optional parameter to filter the upgrade by status.
-    elements: str
-    type: list
-  productTypes:
-    description:
-    - ProductTypes query parameter. Optional parameter to filter the upgrade by product type.
+      - Status query parameter. Optional parameter to filter the upgrade by status.
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationFirmwareUpgrades
-  description: Complete reference of the getOrganizationFirmwareUpgrades API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-firmware-upgrades
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_firmware_upgrades,
-
-  - Paths used are
-    get /organizations/{organizationId}/firmware/upgrades,
+  - description: Complete reference of the getOrganizationFirmwareUpgrades API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-firmware-upgrades
+    name: Cisco Meraki documentation for organizations getOrganizationFirmwareUpgrades
+short_description: Information module for organizations _firmware _upgrades
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _firmware _upgrades
   cisco.meraki.organizations_firmware_upgrades_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -99,7 +103,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_floor_plans_auto_locate_devices_info.py b/plugins/modules/organizations_floor_plans_auto_locate_devices_info.py
index edb4b7b66..38bcc6c60 100644
--- a/plugins/modules/organizations_floor_plans_auto_locate_devices_info.py
+++ b/plugins/modules/organizations_floor_plans_auto_locate_devices_info.py
@@ -5,91 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_floor_plans_auto_locate_devices_info
-short_description: Information module for organizations _floor _plans _auto _locate _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _floor _plans _auto _locate _devices.
-- List auto locate details for each device in your organization.
-version_added: '2.20.0'
+  - Get all organizations _floor _plans _auto _locate _devices.
+  - List auto locate details for each device in your organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_floor_plans_auto_locate_devices_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_floor_plans_auto_locate_devices,
+  - Paths used are get /organizations/{organizationId}/floorPlans/autoLocate/devices,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  floorPlanIds:
+    description:
+      - FloorPlanIds query parameter. Optional parameter to filter devices by one
+        or more floorplan IDs.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter devices by one or
+        more network IDs.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 10000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 10000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter devices by one or more network IDs.
-    elements: str
-    type: list
-  floorPlanIds:
-    description:
-    - FloorPlanIds query parameter. Optional parameter to filter devices by one or more floorplan IDs.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationFloorPlansAutoLocateDevices
-  description: Complete reference of the getOrganizationFloorPlansAutoLocateDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-floor-plans-auto-locate-devices
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_floor_plans_auto_locate_devices,
-
-  - Paths used are
-    get /organizations/{organizationId}/floorPlans/autoLocate/devices,
+  - description: Complete reference of the getOrganizationFloorPlansAutoLocateDevices
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-floor-plans-auto-locate-devices
+    name: Cisco Meraki documentation for organizations getOrganizationFloorPlansAutoLocateDevices
+short_description: Information module for organizations _floor _plans _auto _locate
+  _devices
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _floor _plans _auto _locate _devices
   cisco.meraki.organizations_floor_plans_auto_locate_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -99,7 +106,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_floor_plans_auto_locate_statuses_info.py b/plugins/modules/organizations_floor_plans_auto_locate_statuses_info.py
index 653e3a4e2..22ab52787 100644
--- a/plugins/modules/organizations_floor_plans_auto_locate_statuses_info.py
+++ b/plugins/modules/organizations_floor_plans_auto_locate_statuses_info.py
@@ -5,91 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_floor_plans_auto_locate_statuses_info
-short_description: Information module for organizations _floor _plans _auto _locate _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _floor _plans _auto _locate _statuses.
-- List the status of auto locate for each floorplan in your organization.
-version_added: '2.20.0'
+  - Get all organizations _floor _plans _auto _locate _statuses.
+  - List the status of auto locate for each floorplan in your organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_floor_plans_auto_locate_statuses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_floor_plans_auto_locate_statuses,
+  - Paths used are get /organizations/{organizationId}/floorPlans/autoLocate/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  floorPlanIds:
+    description:
+      - FloorPlanIds query parameter. Optional parameter to filter floorplans by one
+        or more floorplan IDs.
+    elements: str
+    type: list
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter floorplans by one
+        or more network IDs.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 10000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 10000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter floorplans by one or more network IDs.
-    elements: str
-    type: list
-  floorPlanIds:
-    description:
-    - FloorPlanIds query parameter. Optional parameter to filter floorplans by one or more floorplan IDs.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationFloorPlansAutoLocateStatuses
-  description: Complete reference of the getOrganizationFloorPlansAutoLocateStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-floor-plans-auto-locate-statuses
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_floor_plans_auto_locate_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/floorPlans/autoLocate/statuses,
+  - description: Complete reference of the getOrganizationFloorPlansAutoLocateStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-floor-plans-auto-locate-statuses
+    name: Cisco Meraki documentation for organizations getOrganizationFloorPlansAutoLocateStatuses
+short_description: Information module for organizations _floor _plans _auto _locate
+  _statuses
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _floor _plans _auto _locate _statuses
   cisco.meraki.organizations_floor_plans_auto_locate_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -99,7 +106,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_info.py b/plugins/modules/organizations_info.py
index e91dc6e05..aabbc54e4 100644
--- a/plugins/modules/organizations_info.py
+++ b/plugins/modules/organizations_info.py
@@ -5,120 +5,119 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_info
-short_description: Information module for organizations
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations.
-- Get organizations by id.
-- List the organizations that the user has privileges on.
-- Return an organization.
-version_added: '2.16.0'
+  - Get all organizations.
+  - Get organizations by id.
+  - List the organizations that the user has privileges on.
+  - Return an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization, organizations.Organizations.get_organizations,
+  - Paths used are get /organizations, get /organizations/{organizationId},
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 9000. Default is 9000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 9000. Default is 9000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganization
-  description: Complete reference of the getOrganization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization
-- name: Cisco Meraki documentation for organizations getOrganizations
-  description: Complete reference of the getOrganizations API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organizations
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization,
-    organizations.Organizations.get_organizations,
-
-  - Paths used are
-    get /organizations,
-    get /organizations/{organizationId},
+  - description: Complete reference of the getOrganization API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization
+    name: Cisco Meraki documentation for organizations getOrganization
+  - description: Complete reference of the getOrganizations API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organizations
+    name: Cisco Meraki documentation for organizations getOrganizations
+short_description: Information module for organizations
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations
   cisco.meraki.organizations_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
     total_pages: -1
     direction: next
   register: result
-
 - name: Get organizations by id
   cisco.meraki.organizations_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_insight_applications_info.py b/plugins/modules/organizations_insight_applications_info.py
index cd103e37c..b0a99e8a2 100644
--- a/plugins/modules/organizations_insight_applications_info.py
+++ b/plugins/modules/organizations_insight_applications_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_insight_applications_info
-short_description: Information module for organizations _insight _applications
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _insight _applications.
-- List all Insight tracked applications.
-version_added: '2.16.0'
+  - Get all organizations _insight _applications.
+  - List all Insight tracked applications.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_insight_applications_info
+notes:
+  - SDK Method used are insight.Insight.get_organization_insight_applications,
+  - Paths used are get /organizations/{organizationId}/insight/applications,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for insight getOrganizationInsightApplications
-  description: Complete reference of the getOrganizationInsightApplications API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-applications
-notes:
-  - SDK Method used are
-    insight.Insight.get_organization_insight_applications,
-
-  - Paths used are
-    get /organizations/{organizationId}/insight/applications,
+  - description: Complete reference of the getOrganizationInsightApplications API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-applications
+    name: Cisco Meraki documentation for insight getOrganizationInsightApplications
+short_description: Information module for organizations _insight _applications
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _insight _applications
   cisco.meraki.organizations_insight_applications_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_insight_monitored_media_servers.py b/plugins/modules/organizations_insight_monitored_media_servers.py
index 6b04d4fcb..d43e639be 100644
--- a/plugins/modules/organizations_insight_monitored_media_servers.py
+++ b/plugins/modules/organizations_insight_monitored_media_servers.py
@@ -5,25 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_insight_monitored_media_servers
-short_description: Resource module for organizations _insight _monitored _media _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _insight _monitored _media _servers.
-- Add a media server to be monitored for this organization. Only valid for organizations with Meraki Insight.
-- Delete a monitored media server from this organization. Only valid for organizations with Meraki Insight.
-- Update a monitored media server for this organization. Only valid for organizations with Meraki Insight.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _insight
+    _monitored _media _servers.
+  - Add a media server to be monitored for this organization. Only valid for organizations
+    with Meraki Insight.
+  - Delete a monitored media server from this organization. Only valid for organizations
+    with Meraki Insight.
+  - Update a monitored media server for this organization. Only valid for organizations
+    with Meraki Insight.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_insight_monitored_media_servers
+notes:
+  - SDK Method used are insight.Insight.create_organization_insight_monitored_media_server,
+    insight.Insight.delete_organization_insight_monitored_media_server, insight.Insight.update_organization_insight_monitored_media_server,
+  - Paths used are post /organizations/{organizationId}/insight/monitoredMediaServers,
+    delete /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
+    put /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
 options:
   address:
     description: The IP address (IPv4 only) or hostname of the media server to monitor.
     type: str
   bestEffortMonitoringEnabled:
-    description: Indicates that if the media server doesn't respond to ICMP pings, the
-      nearest hop will be used in its stead.
+    description: Indicates that if the media server doesn't respond to ICMP pings,
+      the nearest hop will be used in its stead.
     type: bool
   monitoredMediaServerId:
     description: MonitoredMediaServerId path parameter. Monitored media server ID.
@@ -35,114 +42,106 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for insight createOrganizationInsightMonitoredMediaServer
-  description: Complete reference of the createOrganizationInsightMonitoredMediaServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-insight-monitored-media-server
-- name: Cisco Meraki documentation for insight deleteOrganizationInsightMonitoredMediaServer
-  description: Complete reference of the deleteOrganizationInsightMonitoredMediaServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-insight-monitored-media-server
-- name: Cisco Meraki documentation for insight updateOrganizationInsightMonitoredMediaServer
-  description: Complete reference of the updateOrganizationInsightMonitoredMediaServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-insight-monitored-media-server
-notes:
-  - SDK Method used are
-    insight.Insight.create_organization_insight_monitored_media_server,
-    insight.Insight.delete_organization_insight_monitored_media_server,
-    insight.Insight.update_organization_insight_monitored_media_server,
-
-  - Paths used are
-    post /organizations/{organizationId}/insight/monitoredMediaServers,
-    delete /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
-    put /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
+  - description: Complete reference of the createOrganizationInsightMonitoredMediaServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-insight-monitored-media-server
+    name: Cisco Meraki documentation for insight createOrganizationInsightMonitoredMediaServer
+  - description: Complete reference of the deleteOrganizationInsightMonitoredMediaServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-insight-monitored-media-server
+    name: Cisco Meraki documentation for insight deleteOrganizationInsightMonitoredMediaServer
+  - description: Complete reference of the updateOrganizationInsightMonitoredMediaServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-insight-monitored-media-server
+    name: Cisco Meraki documentation for insight updateOrganizationInsightMonitoredMediaServer
+short_description: Resource module for organizations _insight _monitored _media _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_insight_monitored_media_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     address: 123.123.123.1
     bestEffortMonitoringEnabled: true
     name: Sample VoIP Provider
     organizationId: string
-
 - name: Delete by id
   cisco.meraki.organizations_insight_monitored_media_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     monitoredMediaServerId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_insight_monitored_media_servers:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     address: 123.123.123.1
     bestEffortMonitoringEnabled: true
     monitoredMediaServerId: string
     name: Sample VoIP Provider
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_insight_monitored_media_servers_info.py b/plugins/modules/organizations_insight_monitored_media_servers_info.py
index 466871e2a..0bd7304a0 100644
--- a/plugins/modules/organizations_insight_monitored_media_servers_info.py
+++ b/plugins/modules/organizations_insight_monitored_media_servers_info.py
@@ -5,102 +5,101 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_insight_monitored_media_servers_info
-short_description: Information module for organizations _insight _monitored _media _servers
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _insight _monitored _media _servers.
-- Get organizations _insight _monitored _media _servers by id.
-- List the monitored media servers for this organization. Only valid for organizations with Meraki Insight.
-- Return a monitored media server for this organization. Only valid for organizations with Meraki Insight.
-version_added: '2.16.0'
+  - Get all organizations _insight _monitored _media _servers.
+  - Get organizations _insight _monitored _media _servers by id.
+  - List the monitored media servers for this organization. Only valid for organizations
+    with Meraki Insight.
+  - Return a monitored media server for this organization. Only valid for organizations
+    with Meraki Insight.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_insight_monitored_media_servers_info
+notes:
+  - SDK Method used are insight.Insight.get_organization_insight_monitored_media_server,
+    insight.Insight.get_organization_insight_monitored_media_servers,
+  - Paths used are get /organizations/{organizationId}/insight/monitoredMediaServers,
+    get /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  monitoredMediaServerId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - MonitoredMediaServerId path parameter. Monitored media server ID.
     type: str
-  monitoredMediaServerId:
+  organizationId:
     description:
-    - MonitoredMediaServerId path parameter. Monitored media server ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for insight getOrganizationInsightMonitoredMediaServer
-  description: Complete reference of the getOrganizationInsightMonitoredMediaServer API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-monitored-media-server
-- name: Cisco Meraki documentation for insight getOrganizationInsightMonitoredMediaServers
-  description: Complete reference of the getOrganizationInsightMonitoredMediaServers API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-monitored-media-servers
-notes:
-  - SDK Method used are
-    insight.Insight.get_organization_insight_monitored_media_server,
-    insight.Insight.get_organization_insight_monitored_media_servers,
-
-  - Paths used are
-    get /organizations/{organizationId}/insight/monitoredMediaServers,
-    get /organizations/{organizationId}/insight/monitoredMediaServers/{monitoredMediaServerId},
+  - description: Complete reference of the getOrganizationInsightMonitoredMediaServer
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-monitored-media-server
+    name: Cisco Meraki documentation for insight getOrganizationInsightMonitoredMediaServer
+  - description: Complete reference of the getOrganizationInsightMonitoredMediaServers
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-insight-monitored-media-servers
+    name: Cisco Meraki documentation for insight getOrganizationInsightMonitoredMediaServers
+short_description: Information module for organizations _insight _monitored _media
+  _servers
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _insight _monitored _media _servers
   cisco.meraki.organizations_insight_monitored_media_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _insight _monitored _media _servers by id
   cisco.meraki.organizations_insight_monitored_media_servers_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     monitoredMediaServerId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_claim.py b/plugins/modules/organizations_inventory_claim.py
index fb963470b..8b99ac348 100644
--- a/plugins/modules/organizations_inventory_claim.py
+++ b/plugins/modules/organizations_inventory_claim.py
@@ -5,20 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_claim
-short_description: Resource module for organizations _inventory _claim
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _inventory _claim.
-- >
-   Claim a list of devices, licenses, and/or orders into an organization inventory. When claiming by order, all
-   devices and licenses in the order will be claimed; licenses will be added to the organization and devices will be
-   placed in the organization's inventory. This operation can be used up to ten times within a single five minute
-   window.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _inventory _claim.
+  - 'Claim a list of devices, licenses, and/or orders into an organization inventory.
+    When claiming by order, all devices and licenses in the order will be claimed;
+    licenses will be added to the organization and devices will be placed in the organization''s
+    inventory. This operation can be used up to ten times within a single five minute
+    window.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_claim
+notes:
+  - SDK Method used are organizations.Organizations.claim_into_organization_inventory,
+  - Paths used are post /organizations/{organizationId}/inventory/claim,
 options:
   licenses:
     description: The licenses that should be claimed.
@@ -29,10 +31,10 @@
         type: str
       mode:
         description: Co-term licensing only either 'renew' or 'addDevices'. 'addDevices'
-          will increase the license limit, while 'renew' will extend the amount of time
-          until expiration. Defaults to 'addDevices'. All licenses must be claimed with
-          the same mode, and at most one renewal can be claimed at a time. Does not
-          apply to organizations using per-device licensing model.
+          will increase the license limit, while 'renew' will extend the amount of
+          time until expiration. Defaults to 'addDevices'. All licenses must be claimed
+          with the same mode, and at most one renewal can be claimed at a time. Does
+          not apply to organizations using per-device licensing model.
         type: str
     type: list
   orders:
@@ -47,52 +49,47 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations claimIntoOrganizationInventory
-  description: Complete reference of the claimIntoOrganizationInventory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!claim-into-organization-inventory
-notes:
-  - SDK Method used are
-    organizations.Organizations.claim_into_organization_inventory,
-
-  - Paths used are
-    post /organizations/{organizationId}/inventory/claim,
+  - description: Complete reference of the claimIntoOrganizationInventory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!claim-into-organization-inventory
+    name: Cisco Meraki documentation for organizations claimIntoOrganizationInventory
+short_description: Resource module for organizations _inventory _claim
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_inventory_claim:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     licenses:
-    - key: Z2XXXXXXXXXX
-      mode: addDevices
+      - key: Z2XXXXXXXXXX
+        mode: addDevices
     orders:
-    - 4CXXXXXXX
+      - 4CXXXXXXX
     organizationId: string
     serials:
-    - Q234-ABCD-5678
-
+      - Q234-ABCD-5678
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_devices_info.py b/plugins/modules/organizations_inventory_devices_info.py
index 3f32ebe99..b200ea533 100644
--- a/plugins/modules/organizations_inventory_devices_info.py
+++ b/plugins/modules/organizations_inventory_devices_info.py
@@ -5,147 +5,158 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_devices_info
-short_description: Information module for organizations _inventory _devices
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _inventory _devices.
-- Get organizations _inventory _devices by id.
-- Return a single device from the inventory of an organization.
-- Return the device inventory for an organization.
-version_added: '2.16.0'
+  - Get all organizations _inventory _devices.
+  - Get organizations _inventory _devices by id.
+  - Return a single device from the inventory of an organization.
+  - Return the device inventory for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_devices_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_inventory_device,
+    organizations.Organizations.get_organization_inventory_devices,
+  - Paths used are get /organizations/{organizationId}/inventory/devices, get /organizations/{organizationId}/inventory/devices/{serial},
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  usedState:
-    description:
-    - UsedState query parameter. Filter results by used or unused inventory. Accepted values are 'used' or 'unused'.
-    type: str
-  search:
-    description:
-    - Search query parameter. Search for devices in inventory based on serial number, mac address, or model.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   macs:
     description:
-    - Macs query parameter. Search for devices in inventory based on mac addresses.
+      - Macs query parameter. Search for devices in inventory based on mac addresses.
     elements: str
     type: list
-  networkIds:
+  models:
     description:
-    - >
-      NetworkIds query parameter. Search for devices in inventory based on network ids. Use explicit 'null' value
-      to get available devices only.
+      - Models query parameter. Search for devices in inventory based on model.
     elements: str
     type: list
-  serials:
+  networkIds:
     description:
-    - Serials query parameter. Search for devices in inventory based on serials.
+      - 'NetworkIds query parameter. Search for devices in inventory based on network
+        ids. Use explicit ''null'' value to get available devices only.
+
+        '
     elements: str
     type: list
-  models:
+  orderNumbers:
     description:
-    - Models query parameter. Search for devices in inventory based on model.
+      - OrderNumbers query parameter. Search for devices in inventory based on order
+        numbers.
     elements: str
     type: list
-  orderNumbers:
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
     description:
-    - OrderNumbers query parameter. Search for devices in inventory based on order numbers.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  productTypes:
+    description:
+      - 'ProductTypes query parameter. Filter devices by product type. Accepted values
+        are appliance, camera, cellularGateway, secureConnect, sensor, switch, systemsManager,
+        wireless, and wirelessController.
+
+        '
     elements: str
     type: list
-  tags:
+  search:
+    description:
+      - Search query parameter. Search for devices in inventory based on serial number,
+        mac address, or model.
+    type: str
+  serial:
     description:
-    - >
-      Tags query parameter. Filter devices by tags. The filtering is case-sensitive. If tags are included,
-      'tagsFilterType' should also be included (see below).
+      - Serial path parameter.
+    type: str
+  serials:
+    description:
+      - Serials query parameter. Search for devices in inventory based on serials.
     elements: str
     type: list
-  tagsFilterType:
+  startingAfter:
     description:
-    - >
-      TagsFilterType query parameter. To use with 'tags' parameter, to filter devices which contain ANY or ALL
-      given tags. Accepted values are 'withAnyTags' or 'withAllTags', default is 'withAnyTags'.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  productTypes:
+  tags:
     description:
-    - >
-      ProductTypes query parameter. Filter devices by product type. Accepted values are appliance, camera,
-      cellularGateway, secureConnect, sensor, switch, systemsManager, wireless, and wirelessController.
+      - 'Tags query parameter. Filter devices by tags. The filtering is case-sensitive.
+        If tags are included, ''tagsFilterType'' should also be included (see below).
+
+        '
     elements: str
     type: list
-  serial:
+  tagsFilterType:
     description:
-    - Serial path parameter.
+      - 'TagsFilterType query parameter. To use with ''tags'' parameter, to filter
+        devices which contain ANY or ALL given tags. Accepted values are ''withAnyTags''
+        or ''withAllTags'', default is ''withAnyTags''.
+
+        '
+    type: str
+  usedState:
+    description:
+      - UsedState query parameter. Filter results by used or unused inventory. Accepted
+        values are 'used' or 'unused'.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationInventoryDevice
-  description: Complete reference of the getOrganizationInventoryDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-device
-- name: Cisco Meraki documentation for organizations getOrganizationInventoryDevices
-  description: Complete reference of the getOrganizationInventoryDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-devices
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_inventory_device,
-    organizations.Organizations.get_organization_inventory_devices,
-
-  - Paths used are
-    get /organizations/{organizationId}/inventory/devices,
-    get /organizations/{organizationId}/inventory/devices/{serial},
+  - description: Complete reference of the getOrganizationInventoryDevice API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-device
+    name: Cisco Meraki documentation for organizations getOrganizationInventoryDevice
+  - description: Complete reference of the getOrganizationInventoryDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-devices
+    name: Cisco Meraki documentation for organizations getOrganizationInventoryDevices
+short_description: Information module for organizations _inventory _devices
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _inventory _devices
   cisco.meraki.organizations_inventory_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -163,33 +174,31 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get organizations _inventory _devices by id
   cisco.meraki.organizations_inventory_devices_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     serial: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_export_events.py b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_export_events.py
index 59ebc1b92..1e7c5055b 100644
--- a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_export_events.py
+++ b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_export_events.py
@@ -5,27 +5,28 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_onboarding_cloud_monitoring_export_events
-short_description: Resource module for organizations _inventory _onboarding _cloud _monitoring _export _events
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _inventory _onboarding _cloud _monitoring _export _events.
-- Imports event logs related to the onboarding app into elastisearch.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _inventory _onboarding _cloud
+    _monitoring _export _events.
+  - Imports event logs related to the onboarding app into elastisearch.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_onboarding_cloud_monitoring_export_events
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_export_event,
+  - Paths used are post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/exportEvents,
 options:
   logEvent:
-    description: The type of log event this is recording, e.g. Download or opening a
-      banner.
+    description: The type of log event this is recording, e.g. Download or opening
+      a banner.
     type: str
   organizationId:
     description: OrganizationId path parameter. Organization ID.
     type: str
   request:
-    description: Used to describe if this event was the result of a redirect. E.g. A
-      query param if an info banner is being used.
+    description: Used to describe if this event was the result of a redirect. E.g.
+      A query param if an info banner is being used.
     type: str
   targetOS:
     description: The name of the onboarding distro being downloaded.
@@ -34,49 +35,46 @@
     description: A JavaScript UTC datetime stamp for when the even occurred.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringExportEvent
-  description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringExportEvent API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-export-event
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_export_event,
-
-  - Paths used are
-    post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/exportEvents,
+  - description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringExportEvent
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-export-event
+    name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringExportEvent
+short_description: Resource module for organizations _inventory _onboarding _cloud
+  _monitoring _export _events
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_inventory_onboarding_cloud_monitoring_export_events:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     logEvent: download
     organizationId: string
     request: r=cb
     targetOS: mac
     timestamp: 1526087474
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports.py b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports.py
index 208e10346..da314b205 100644
--- a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports.py
+++ b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports.py
@@ -5,16 +5,18 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_onboarding_cloud_monitoring_imports
-short_description: Resource module for organizations _inventory _onboarding _cloud _monitoring _imports
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _inventory _onboarding _cloud _monitoring _imports.
-- Commits the import operation to complete the onboarding of a device into Dashboard for monitoring.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _inventory _onboarding _cloud
+    _monitoring _imports.
+  - Commits the import operation to complete the onboarding of a device into Dashboard
+    for monitoring.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_onboarding_cloud_monitoring_imports
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_import,
+  - Paths used are post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/imports,
 options:
   devices:
     description: A set of device imports to commit.
@@ -34,50 +36,47 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringImport
-  description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringImport API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-import
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_import,
-
-  - Paths used are
-    post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/imports,
+  - description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringImport
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-import
+    name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringImport
+short_description: Resource module for organizations _inventory _onboarding _cloud
+  _monitoring _imports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_inventory_onboarding_cloud_monitoring_imports:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     devices:
-    - deviceId: 161b2602-a713-4aac-b1eb-d9b55205353d
-      networkId: '1338481'
-      udi: PID:C9200L-24P-4G SN:JAE25220R2K
+      - deviceId: 161b2602-a713-4aac-b1eb-d9b55205353d
+        networkId: '1338481'
+        udi: PID:C9200L-24P-4G SN:JAE25220R2K
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports_info.py b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports_info.py
index e27cbde2f..e6b8a880b 100644
--- a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports_info.py
+++ b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_imports_info.py
@@ -5,71 +5,68 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_onboarding_cloud_monitoring_imports_info
-short_description: Information module for organizations _inventory _onboarding _cloud _monitoring _imports
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _inventory _onboarding _cloud _monitoring _imports.
-- Check the status of a committed Import operation.
-version_added: '2.16.0'
+  - Get all organizations _inventory _onboarding _cloud _monitoring _imports.
+  - Check the status of a committed Import operation.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_onboarding_cloud_monitoring_imports_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_inventory_onboarding_cloud_monitoring_imports,
+  - Paths used are get /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/imports,
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   importIds:
     description:
-    - ImportIds query parameter. Import ids from an imports.
+      - ImportIds query parameter. Import ids from an imports.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationInventoryOnboardingCloudMonitoringImports
-  description: Complete reference of the getOrganizationInventoryOnboardingCloudMonitoringImports API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-onboarding-cloud-monitoring-imports
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_inventory_onboarding_cloud_monitoring_imports,
-
-  - Paths used are
-    get /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/imports,
+  - description: Complete reference of the getOrganizationInventoryOnboardingCloudMonitoringImports
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-onboarding-cloud-monitoring-imports
+    name: Cisco Meraki documentation for organizations getOrganizationInventoryOnboardingCloudMonitoringImports
+short_description: Information module for organizations _inventory _onboarding _cloud
+  _monitoring _imports
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _inventory _onboarding _cloud _monitoring _imports
   cisco.meraki.organizations_inventory_onboarding_cloud_monitoring_imports_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     importIds: []
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_networks_info.py b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_networks_info.py
index c92c0385d..cc447d0e6 100644
--- a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_networks_info.py
+++ b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_networks_info.py
@@ -5,89 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_onboarding_cloud_monitoring_networks_info
-short_description: Information module for organizations _inventory _onboarding _cloud _monitoring _networks
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _inventory _onboarding _cloud _monitoring _networks.
-- Returns list of networks eligible for adding cloud monitored device.
-version_added: '2.16.0'
+  - Get all organizations _inventory _onboarding _cloud _monitoring _networks.
+  - Returns list of networks eligible for adding cloud monitored device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_onboarding_cloud_monitoring_networks_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_inventory_onboarding_cloud_monitoring_networks,
+  - Paths used are get /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/networks,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
+  deviceType:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - DeviceType query parameter. Device Type switch or wireless controller.
     type: str
-  deviceType:
+  endingBefore:
     description:
-    - DeviceType query parameter. Device Type switch or wireless controller.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  search:
+  headers:
+    description: Additional headers.
+    type: dict
+  organizationId:
     description:
-    - Search query parameter. Optional parameter to search on network name.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 100000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 100000. Default is 1000.
     type: int
-  startingAfter:
+  search:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - Search query parameter. Optional parameter to search on network name.
     type: str
-  endingBefore:
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationInventoryOnboardingCloudMonitoringNetworks
-  description: Complete reference of the getOrganizationInventoryOnboardingCloudMonitoringNetworks API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-onboarding-cloud-monitoring-networks
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_inventory_onboarding_cloud_monitoring_networks,
-
-  - Paths used are
-    get /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/networks,
+  - description: Complete reference of the getOrganizationInventoryOnboardingCloudMonitoringNetworks
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-onboarding-cloud-monitoring-networks
+    name: Cisco Meraki documentation for organizations getOrganizationInventoryOnboardingCloudMonitoringNetworks
+short_description: Information module for organizations _inventory _onboarding _cloud
+  _monitoring _networks
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _inventory _onboarding _cloud _monitoring _networks
   cisco.meraki.organizations_inventory_onboarding_cloud_monitoring_networks_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     deviceType: string
     search: string
     perPage: 0
@@ -97,7 +102,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_prepare.py b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_prepare.py
index e672ec699..045f362a0 100644
--- a/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_prepare.py
+++ b/plugins/modules/organizations_inventory_onboarding_cloud_monitoring_prepare.py
@@ -5,18 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_onboarding_cloud_monitoring_prepare
-short_description: Resource module for organizations _inventory _onboarding _cloud _monitoring _prepare
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _inventory _onboarding _cloud _monitoring _prepare.
-- >
-   Initiates or updates an import session. An import ID will be generated and used when you are ready to commit the
-   import.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _inventory _onboarding _cloud
+    _monitoring _prepare.
+  - 'Initiates or updates an import session. An import ID will be generated and used
+    when you are ready to commit the import.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_onboarding_cloud_monitoring_prepare
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_prepare,
+  - Paths used are post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/prepare,
 options:
   devices:
     description: A set of devices to import (or update).
@@ -32,10 +34,12 @@
             description: Name of the configured TLS certificate.
             type: str
           localInterface:
-            description: Number of the vlan expected to be used to connect to the cloud.
+            description: Number of the vlan expected to be used to connect to the
+              cloud.
             type: int
           loopbackNumber:
-            description: Number of the configured Loopback Interface used for TLS overlay.
+            description: Number of the configured Loopback Interface used for TLS
+              overlay.
             type: int
           name:
             description: Name of the configured TLS tunnel.
@@ -113,95 +117,80 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringPrepare
-  description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringPrepare API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-prepare
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_inventory_onboarding_cloud_monitoring_prepare,
-
-  - Paths used are
-    post /organizations/{organizationId}/inventory/onboarding/cloudMonitoring/prepare,
+  - description: Complete reference of the createOrganizationInventoryOnboardingCloudMonitoringPrepare
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-inventory-onboarding-cloud-monitoring-prepare
+    name: Cisco Meraki documentation for organizations createOrganizationInventoryOnboardingCloudMonitoringPrepare
+short_description: Resource module for organizations _inventory _onboarding _cloud
+  _monitoring _prepare
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_inventory_onboarding_cloud_monitoring_prepare:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     devices:
-    - sudi: '-----BEGIN CERTIFICATE-----
-        MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
-        gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT
-        YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
-        RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx
-        MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
-        YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD
-        aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
-        MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn
-        MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
-        uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA
-        ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
-        pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS
-        KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM2
-        aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU
-        CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
-        USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E
-        BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
-        1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa
-        jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
-        a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/
-        uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
-        UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ
-        wTw70BVktzJnb0VLeDg=
-        -----END CERTIFICATE-----'
-      tunnel:
-        certificateName: DeviceSUDI
-        localInterface: 1
-        loopbackNumber: 1000
-        name: MERAKI
-      user:
-        username: Meraki
-      vty:
-        accessList:
-          vtyIn:
-            name: MERAKI_IN
-          vtyOut:
-            name: MERAKI_OUT
-        authentication:
-          group:
-            name: ''
-        authorization:
-          group:
-            name: MERAKI
-        endLineNumber: 17
-        rotaryNumber: 50
-        startLineNumber: 16
+      - sudi: '-----BEGIN CERTIFICATE----- MIIEKjCCAxKgAwIBAgIRANb+lsED3eb4+6YKLFFYqEkwDQYJKoZIhvcNAQELBQAw
+          gYcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhT YW4gSm9zZTEcMBoGA1UECgwTQ2lzY28gU3lzdGVtcywgSW5jLjESMBAGA1UECwwJ
+          RE5BU3BhY2VzMR4wHAYDVQQDDBVjaXNjby5vcGVucm9hbWluZy5vcmcwHhcNMjAx MTA1MjEzMzM1WhcNMjExMTA1MjIzMzM1WjCBpDEcMBoGCgmSJomT8ixkAQETDGRu
+          YXNwYWNlczpVUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVD aXNjbzEcMBoGA1UECxMTV0JBOldSSVggRW5kLUVudGl0eTE8MDoGA1UEAxMzNjQ3
+          MDcwNDM4NDQ5NjQxMjAwMDAuMTg4MzQuaHMuY2lzY28ub3BlbnJvYW1pbmcub3Jn MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqjP9QgRGyUO3p7SH9QK
+          uTq6UYK7nAyjImgS4yQxeBkyZ5f2EUkX8m/AOcewpPxxPBhjPKRwxGeX3S50ksiA ayFomUeslR0S0Z7RN9rzJa+CFyi9MwWIHMbLgXpB8tsSpgTAqwrzoTzOGq9fgC6u
+          pZhdZrBkg3FeJgD88goCi9mZDsY2YAoeGRLFJ2fR8iICqIVQy+Htq9pE22WBLpnS KjL3+mR9FArHNFtWlhKF2YHMUqyHHrnZnF/Ns7QNoMMF7/CK18iAKgnb+2wuGKM2
+          aEMddOeOTtz+i/rgjkp/RGMt011EdCsso0/cTo9qqX/bxOOCE4/Mne/ChMkQPnNU CwIDAQABo3IwcDAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFIG+4l5yiB01gP0sw4ML
+          USopqYcuMB0GA1UdDgQWBBSby1T9leYVOVVdOZXiHCSaDDEMiDAOBgNVHQ8BAf8E BAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEyE
+          1mjSUyY6uNp6W4l20w7SskALSJDRKkOeZxAgF3VMxlsCuEl70s9oEfntwIpyQtSa jON/9yJHbwm/Az824bmk8Dc7AXIPhay+dftXb8j529gPuYB9AKoPNg0NctkyYCQh
+          a/3YQVdDWX7XgmEiXkL57M7G6+IdcPDONLArfjOcT9qHdkVVq1AIjlMSx3OQQmm/ uoLb/G9q/97QA2/l8shG/Na8HjVqGLcl5TNZdbNhs2w9ogxr/GNzqdvym6RQ8vT/
+          UR2n+uwH4n1MUxmHYYeyot5dnIV1IJ6hQ54JAncM9HvCLFk1WHz6RKshQUCuPBiJ wTw70BVktzJnb0VLeDg=
+          -----END CERTIFICATE-----'
+        tunnel:
+          certificateName: DeviceSUDI
+          localInterface: 1
+          loopbackNumber: 1000
+          name: MERAKI
+        user:
+          username: Meraki
+        vty:
+          accessList:
+            vtyIn:
+              name: MERAKI_IN
+            vtyOut:
+              name: MERAKI_OUT
+          authentication:
+            group:
+              name: ''
+          authorization:
+            group:
+              name: MERAKI
+          endLineNumber: 17
+          rotaryNumber: 50
+          startLineNumber: 16
     options:
       skipCommit: false
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_inventory_release.py b/plugins/modules/organizations_inventory_release.py
index 0035ab519..e01fefdff 100644
--- a/plugins/modules/organizations_inventory_release.py
+++ b/plugins/modules/organizations_inventory_release.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_inventory_release
-short_description: Resource module for organizations _inventory _release
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _inventory _release.
-- Release a list of claimed devices from an organization.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _inventory _release.
+  - Release a list of claimed devices from an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_inventory_release
+notes:
+  - SDK Method used are organizations.Organizations.release_from_organization_inventory,
+  - Paths used are post /organizations/{organizationId}/inventory/release,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -24,47 +24,42 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations releaseFromOrganizationInventory
-  description: Complete reference of the releaseFromOrganizationInventory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!release-from-organization-inventory
-notes:
-  - SDK Method used are
-    organizations.Organizations.release_from_organization_inventory,
-
-  - Paths used are
-    post /organizations/{organizationId}/inventory/release,
+  - description: Complete reference of the releaseFromOrganizationInventory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!release-from-organization-inventory
+    name: Cisco Meraki documentation for organizations releaseFromOrganizationInventory
+short_description: Resource module for organizations _inventory _release
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_inventory_release:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     serials:
-    - Q234-ABCD-5678
-
+      - Q234-ABCD-5678
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses.py b/plugins/modules/organizations_licenses.py
index 425b58291..85553b59a 100644
--- a/plugins/modules/organizations_licenses.py
+++ b/plugins/modules/organizations_licenses.py
@@ -5,21 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses
-short_description: Resource module for organizations _licenses
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _licenses.
-- Update a license.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _licenses.
+  - Update a license.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_license,
+  - Paths used are put /organizations/{organizationId}/licenses/{licenseId},
 options:
   deviceSerial:
     description: The serial number of the device to assign this license to. Set this
-      to null to unassign the license. If a different license is already active on the
-      device, this parameter will control queueing/dequeuing this license.
+      to null to unassign the license. If a different license is already active on
+      the device, this parameter will control queueing/dequeuing this license.
     type: str
   licenseId:
     description: LicenseId path parameter. License ID.
@@ -28,48 +28,43 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationLicense
-  description: Complete reference of the updateOrganizationLicense API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-license
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_license,
-
-  - Paths used are
-    put /organizations/{organizationId}/licenses/{licenseId},
+  - description: Complete reference of the updateOrganizationLicense API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-license
+    name: Cisco Meraki documentation for organizations updateOrganizationLicense
+short_description: Resource module for organizations _licenses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update by id
   cisco.meraki.organizations_licenses:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     deviceSerial: Q234-ABCD-5678
     licenseId: string
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_assign_seats.py b/plugins/modules/organizations_licenses_assign_seats.py
index 18eb533c3..bd9fb2b82 100644
--- a/plugins/modules/organizations_licenses_assign_seats.py
+++ b/plugins/modules/organizations_licenses_assign_seats.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_assign_seats
-short_description: Resource module for organizations _licenses _assign _seats
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _licenses _assign _seats.
-- Assign SM seats to a network. This will increase the managed SM device limit of the network.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _licenses _assign _seats.
+  - Assign SM seats to a network. This will increase the managed SM device limit of
+    the network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_assign_seats
+notes:
+  - SDK Method used are organizations.Organizations.assign_organization_licenses_seats,
+  - Paths used are post /organizations/{organizationId}/licenses/assignSeats,
 options:
   licenseId:
     description: The ID of the SM license to assign seats from.
@@ -30,48 +31,43 @@
       or equal to the total number of seats of the license.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations assignOrganizationLicensesSeats
-  description: Complete reference of the assignOrganizationLicensesSeats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!assign-organization-licenses-seats
-notes:
-  - SDK Method used are
-    organizations.Organizations.assign_organization_licenses_seats,
-
-  - Paths used are
-    post /organizations/{organizationId}/licenses/assignSeats,
+  - description: Complete reference of the assignOrganizationLicensesSeats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!assign-organization-licenses-seats
+    name: Cisco Meraki documentation for organizations assignOrganizationLicensesSeats
+short_description: Resource module for organizations _licenses _assign _seats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_licenses_assign_seats:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     licenseId: '1234'
     networkId: N_24329156
     organizationId: string
     seatCount: 20
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_info.py b/plugins/modules/organizations_licenses_info.py
index 9fc09b597..805fff2b7 100644
--- a/plugins/modules/organizations_licenses_info.py
+++ b/plugins/modules/organizations_licenses_info.py
@@ -5,70 +5,65 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_info
-short_description: Information module for organizations _licenses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get organizations _licenses by id.
-- Display a license.
-version_added: '2.16.0'
+  - Get organizations _licenses by id.
+  - Display a license.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_license,
+  - Paths used are get /organizations/{organizationId}/licenses/{licenseId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  licenseId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - LicenseId path parameter. License ID.
     type: str
-  licenseId:
+  organizationId:
     description:
-    - LicenseId path parameter. License ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationLicense
-  description: Complete reference of the getOrganizationLicense API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-license
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_license,
-
-  - Paths used are
-    get /organizations/{organizationId}/licenses/{licenseId},
+  - description: Complete reference of the getOrganizationLicense API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-license
+    name: Cisco Meraki documentation for organizations getOrganizationLicense
+short_description: Information module for organizations _licenses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get organizations _licenses by id
   cisco.meraki.organizations_licenses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     licenseId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_move.py b/plugins/modules/organizations_licenses_move.py
index 933d20f61..d60f70b8a 100644
--- a/plugins/modules/organizations_licenses_move.py
+++ b/plugins/modules/organizations_licenses_move.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_move
-short_description: Resource module for organizations _licenses _move
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _licenses _move.
-- Move licenses to another organization. This will also move any devices that the licenses are assigned to.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _licenses _move.
+  - Move licenses to another organization. This will also move any devices that the
+    licenses are assigned to.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_move
+notes:
+  - SDK Method used are organizations.Organizations.move_organization_licenses,
+  - Paths used are post /organizations/{organizationId}/licenses/move,
 options:
   destOrganizationId:
     description: The ID of the organization to move the licenses to.
@@ -27,49 +28,44 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations moveOrganizationLicenses
-  description: Complete reference of the moveOrganizationLicenses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licenses
-notes:
-  - SDK Method used are
-    organizations.Organizations.move_organization_licenses,
-
-  - Paths used are
-    post /organizations/{organizationId}/licenses/move,
+  - description: Complete reference of the moveOrganizationLicenses API.
+    link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licenses
+    name: Cisco Meraki documentation for organizations moveOrganizationLicenses
+short_description: Resource module for organizations _licenses _move
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_licenses_move:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     destOrganizationId: '2930418'
     licenseIds:
-    - '123'
-    - '456'
+      - '123'
+      - '456'
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_move_seats.py b/plugins/modules/organizations_licenses_move_seats.py
index 2ea78c827..895a97019 100644
--- a/plugins/modules/organizations_licenses_move_seats.py
+++ b/plugins/modules/organizations_licenses_move_seats.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_move_seats
-short_description: Resource module for organizations _licenses _move _seats
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _licenses _move _seats.
-- Move SM seats to another organization.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _licenses _move _seats.
+  - Move SM seats to another organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_move_seats
+notes:
+  - SDK Method used are organizations.Organizations.move_organization_licenses_seats,
+  - Paths used are post /organizations/{organizationId}/licenses/moveSeats,
 options:
   destOrganizationId:
     description: The ID of the organization to move the SM seats to.
@@ -26,52 +26,47 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
   seatCount:
-    description: The number of seats to move to the new organization. Must be less than
-      or equal to the total number of seats of the license.
+    description: The number of seats to move to the new organization. Must be less
+      than or equal to the total number of seats of the license.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations moveOrganizationLicensesSeats
-  description: Complete reference of the moveOrganizationLicensesSeats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licenses-seats
-notes:
-  - SDK Method used are
-    organizations.Organizations.move_organization_licenses_seats,
-
-  - Paths used are
-    post /organizations/{organizationId}/licenses/moveSeats,
+  - description: Complete reference of the moveOrganizationLicensesSeats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licenses-seats
+    name: Cisco Meraki documentation for organizations moveOrganizationLicensesSeats
+short_description: Resource module for organizations _licenses _move _seats
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_licenses_move_seats:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     destOrganizationId: '2930418'
     licenseId: '1234'
     organizationId: string
     seatCount: 20
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_overview_info.py b/plugins/modules/organizations_licenses_overview_info.py
index fc934e71f..d99e64b40 100644
--- a/plugins/modules/organizations_licenses_overview_info.py
+++ b/plugins/modules/organizations_licenses_overview_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_overview_info
-short_description: Information module for organizations _licenses _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _licenses _overview.
-- Return an overview of the license state for an organization.
-version_added: '2.16.0'
+  - Get all organizations _licenses _overview.
+  - Return an overview of the license state for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_overview_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_licenses_overview,
+  - Paths used are get /organizations/{organizationId}/licenses/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationLicensesOverview
-  description: Complete reference of the getOrganizationLicensesOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-licenses-overview
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_licenses_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/licenses/overview,
+  - description: Complete reference of the getOrganizationLicensesOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-licenses-overview
+    name: Cisco Meraki documentation for organizations getOrganizationLicensesOverview
+short_description: Information module for organizations _licenses _overview
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _licenses _overview
   cisco.meraki.organizations_licenses_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licenses_renew_seats.py b/plugins/modules/organizations_licenses_renew_seats.py
index 21d6784fb..15cb3044f 100644
--- a/plugins/modules/organizations_licenses_renew_seats.py
+++ b/plugins/modules/organizations_licenses_renew_seats.py
@@ -5,18 +5,19 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licenses_renew_seats
-short_description: Resource module for organizations _licenses _renew _seats
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _licenses _renew _seats.
-- >
-   Renew SM seats of a license. This will extend the license expiration date of managed SM devices covered by this
-   license.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _licenses _renew _seats.
+  - 'Renew SM seats of a license. This will extend the license expiration date of
+    managed SM devices covered by this license.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licenses_renew_seats
+notes:
+  - SDK Method used are organizations.Organizations.renew_organization_licenses_seats,
+  - Paths used are post /organizations/{organizationId}/licenses/renewSeats,
 options:
   licenseIdToRenew:
     description: The ID of the SM license to renew. This license must already be assigned
@@ -30,47 +31,42 @@
       license must have at least as many seats available as there are seats on 'licenseIdToRenew'.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations renewOrganizationLicensesSeats
-  description: Complete reference of the renewOrganizationLicensesSeats API.
-  link: https://developer.cisco.com/meraki/api-v1/#!renew-organization-licenses-seats
-notes:
-  - SDK Method used are
-    organizations.Organizations.renew_organization_licenses_seats,
-
-  - Paths used are
-    post /organizations/{organizationId}/licenses/renewSeats,
+  - description: Complete reference of the renewOrganizationLicensesSeats API.
+    link: https://developer.cisco.com/meraki/api-v1/#!renew-organization-licenses-seats
+    name: Cisco Meraki documentation for organizations renewOrganizationLicensesSeats
+short_description: Resource module for organizations _licenses _renew _seats
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_licenses_renew_seats:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     licenseIdToRenew: '123'
     organizationId: string
     unusedLicenseId: '1234'
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licensing_coterm_licenses_info.py b/plugins/modules/organizations_licensing_coterm_licenses_info.py
index c55da1b53..e076fe31b 100644
--- a/plugins/modules/organizations_licensing_coterm_licenses_info.py
+++ b/plugins/modules/organizations_licensing_coterm_licenses_info.py
@@ -5,99 +5,102 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licensing_coterm_licenses_info
-short_description: Information module for organizations _licensing _coterm _licenses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _licensing _coterm _licenses.
-- List the licenses in a coterm organization.
-version_added: '2.16.0'
+  - Get all organizations _licensing _coterm _licenses.
+  - List the licenses in a coterm organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_licensing_coterm_licenses_info
+notes:
+  - SDK Method used are licensing.Licensing.get_organization_licensing_coterm_licenses,
+  - Paths used are get /organizations/{organizationId}/licensing/coterm/licenses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  expired:
+    description:
+      - Expired query parameter. Filter for licenses that are expired.
+    type: bool
   headers:
     description: Additional headers.
     type: dict
+  invalidated:
+    description:
+      - Invalidated query parameter. Filter for licenses that are invalidated.
+    type: bool
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  invalidated:
-    description:
-    - Invalidated query parameter. Filter for licenses that are invalidated.
-    type: bool
-  expired:
-    description:
-    - Expired query parameter. Filter for licenses that are expired.
-    type: bool
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing getOrganizationLicensingCotermLicenses
-  description: Complete reference of the getOrganizationLicensingCotermLicenses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-licensing-coterm-licenses
-notes:
-  - SDK Method used are
-    licensing.Licensing.get_organization_licensing_coterm_licenses,
-
-  - Paths used are
-    get /organizations/{organizationId}/licensing/coterm/licenses,
+  - description: Complete reference of the getOrganizationLicensingCotermLicenses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-licensing-coterm-licenses
+    name: Cisco Meraki documentation for licensing getOrganizationLicensingCotermLicenses
+short_description: Information module for organizations _licensing _coterm _licenses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _licensing _coterm _licenses
   cisco.meraki.organizations_licensing_coterm_licenses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
-    invalidated: True
-    expired: True
+    invalidated: true
+    expired: true
     organizationId: string
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_licensing_coterm_licenses_move.py b/plugins/modules/organizations_licensing_coterm_licenses_move.py
index 224f8bd82..db11e2dd1 100644
--- a/plugins/modules/organizations_licensing_coterm_licenses_move.py
+++ b/plugins/modules/organizations_licensing_coterm_licenses_move.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_licensing_coterm_licenses_move
-short_description: Resource module for organizations _licensing _coterm _licenses _move
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _licensing _coterm _licenses _move.
-- Moves a license to a different organization coterm only .
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _licensing _coterm _licenses
+    _move.
+  - Moves a license to a different organization coterm only .
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_licensing_coterm_licenses_move
+notes:
+  - SDK Method used are licensing.Licensing.move_organization_licensing_coterm_licenses,
+  - Paths used are post /organizations/{organizationId}/licensing/coterm/licenses/move,
 options:
   destination:
     description: Destination data for the license move.
@@ -49,53 +50,50 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for licensing moveOrganizationLicensingCotermLicenses
-  description: Complete reference of the moveOrganizationLicensingCotermLicenses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licensing-coterm-licenses
-notes:
-  - SDK Method used are
-    licensing.Licensing.move_organization_licensing_coterm_licenses,
-
-  - Paths used are
-    post /organizations/{organizationId}/licensing/coterm/licenses/move,
+  - description: Complete reference of the moveOrganizationLicensingCotermLicenses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!move-organization-licensing-coterm-licenses
+    name: Cisco Meraki documentation for licensing moveOrganizationLicensingCotermLicenses
+short_description: Resource module for organizations _licensing _coterm _licenses
+  _move
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_licensing_coterm_licenses_move:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     destination:
       mode: addDevices
       organizationId: '123'
     licenses:
-    - counts:
-      - count: 5
-        model: MR Enterprise
-      key: Z2AA-BBBB-CCCC
+      - counts:
+          - count: 5
+            model: MR Enterprise
+        key: Z2AA-BBBB-CCCC
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_login_security.py b/plugins/modules/organizations_login_security.py
index fc06d72d0..dcece818c 100644
--- a/plugins/modules/organizations_login_security.py
+++ b/plugins/modules/organizations_login_security.py
@@ -5,32 +5,32 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_login_security
-short_description: Resource module for organizations _login _security
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _login _security.
-- Update the login security settings for an organization.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _login _security.
+  - Update the login security settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_login_security
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_login_security,
+  - Paths used are put /organizations/{organizationId}/loginSecurity,
 options:
   accountLockoutAttempts:
     description: Number of consecutive failed login attempts after which users' accounts
       will be locked.
     type: int
   apiAuthentication:
-    description: Details for indicating whether organization will restrict access to
-      API (but not Dashboard) to certain IP addresses.
+    description: Details for indicating whether organization will restrict access
+      to API (but not Dashboard) to certain IP addresses.
     suboptions:
       ipRestrictionsForKeys:
         description: Details for API-only IP restrictions.
         suboptions:
           enabled:
-            description: Boolean indicating whether the organization will restrict API
-              key (not Dashboard GUI) usage to a specific list of IP addresses or CIDR
-              ranges.
+            description: Boolean indicating whether the organization will restrict
+              API key (not Dashboard GUI) usage to a specific list of IP addresses
+              or CIDR ranges.
             type: bool
           ranges:
             description: List of acceptable IP ranges. Entries can be single IP addresses,
@@ -60,9 +60,9 @@
       every X number of days.
     type: bool
   enforceStrongPasswords:
-    description: Boolean indicating whether users will be forced to choose strong passwords
-      for their accounts. Strong passwords are at least 8 characters that contain 3
-      of the following number, uppercase letter, lowercase letter, and symbol.
+    description: Boolean indicating whether users will be forced to choose strong
+      passwords for their accounts. Strong passwords are at least 8 characters that
+      contain 3 of the following number, uppercase letter, lowercase letter, and symbol.
     type: bool
   enforceTwoFactorAuth:
     description: Boolean indicating whether users in this organization will be required
@@ -75,8 +75,8 @@
       their accounts.
     type: int
   loginIpRanges:
-    description: List of acceptable IP ranges. Entries can be single IP addresses, IP
-      address ranges, and CIDR subnets.
+    description: List of acceptable IP ranges. Entries can be single IP addresses,
+      IP address ranges, and CIDR subnets.
     elements: str
     type: list
   numDifferentPasswords:
@@ -89,51 +89,47 @@
     description: Number of days after which users will be forced to change their password.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationLoginSecurity
-  description: Complete reference of the updateOrganizationLoginSecurity API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-login-security
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_login_security,
-
-  - Paths used are
-    put /organizations/{organizationId}/loginSecurity,
+  - description: Complete reference of the updateOrganizationLoginSecurity API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-login-security
+    name: Cisco Meraki documentation for organizations updateOrganizationLoginSecurity
+short_description: Resource module for organizations _login _security
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_login_security:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     accountLockoutAttempts: 3
     apiAuthentication:
       ipRestrictionsForKeys:
         enabled: true
         ranges:
-        - 192.195.83.1
-        - 192.168.33.33
+          - 192.195.83.1
+          - 192.168.33.33
     enforceAccountLockout: true
     enforceDifferentPasswords: true
     enforceIdleTimeout: true
@@ -143,12 +139,11 @@
     enforceTwoFactorAuth: true
     idleTimeoutMinutes: 30
     loginIpRanges:
-    - 192.195.83.1
-    - 192.195.83.255
+      - 192.195.83.1
+      - 192.195.83.255
     numDifferentPasswords: 3
     organizationId: string
     passwordExpirationDays: 90
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_login_security_info.py b/plugins/modules/organizations_login_security_info.py
index ca6506baf..584df1a53 100644
--- a/plugins/modules/organizations_login_security_info.py
+++ b/plugins/modules/organizations_login_security_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_login_security_info
-short_description: Information module for organizations _login _security
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _login _security.
-- Returns the login security settings for an organization.
-version_added: '2.16.0'
+  - Get all organizations _login _security.
+  - Returns the login security settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_login_security_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_login_security,
+  - Paths used are get /organizations/{organizationId}/loginSecurity,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationLoginSecurity
-  description: Complete reference of the getOrganizationLoginSecurity API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-login-security
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_login_security,
-
-  - Paths used are
-    get /organizations/{organizationId}/loginSecurity,
+  - description: Complete reference of the getOrganizationLoginSecurity API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-login-security
+    name: Cisco Meraki documentation for organizations getOrganizationLoginSecurity
+short_description: Information module for organizations _login _security
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _login _security
   cisco.meraki.organizations_login_security_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_networks_combine.py b/plugins/modules/organizations_networks_combine.py
index 050a177ed..4891103b3 100644
--- a/plugins/modules/organizations_networks_combine.py
+++ b/plugins/modules/organizations_networks_combine.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_networks_combine
-short_description: Resource module for organizations _networks _combine
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _networks _combine.
-- Combine multiple networks into a single network.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _networks _combine.
+  - Combine multiple networks into a single network.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_networks_combine
+notes:
+  - SDK Method used are organizations.Organizations.combine_organization_networks,
+  - Paths used are post /organizations/{organizationId}/networks/combine,
 options:
   enrollmentString:
     description: A unique identifier which can be used for device enrollment or easy
@@ -36,50 +36,45 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations combineOrganizationNetworks
-  description: Complete reference of the combineOrganizationNetworks API.
-  link: https://developer.cisco.com/meraki/api-v1/#!combine-organization-networks
-notes:
-  - SDK Method used are
-    organizations.Organizations.combine_organization_networks,
-
-  - Paths used are
-    post /organizations/{organizationId}/networks/combine,
+  - description: Complete reference of the combineOrganizationNetworks API.
+    link: https://developer.cisco.com/meraki/api-v1/#!combine-organization-networks
+    name: Cisco Meraki documentation for organizations combineOrganizationNetworks
+short_description: Resource module for organizations _networks _combine
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_networks_combine:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     enrollmentString: my-enrollment-string
     name: Long Island Office
     networkIds:
-    - N_1234
-    - N_5678
+      - N_1234
+      - N_5678
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_openapi_spec_info.py b/plugins/modules/organizations_openapi_spec_info.py
index 5f7e3644f..9f5824c60 100644
--- a/plugins/modules/organizations_openapi_spec_info.py
+++ b/plugins/modules/organizations_openapi_spec_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_openapi_spec_info
-short_description: Information module for organizations _openapi _spec
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _openapi _spec.
-- Return the OpenAPI Specification of the organization's API documentation in JSON.
-version_added: '2.16.0'
+  - Get all organizations _openapi _spec.
+  - Return the OpenAPI Specification of the organization's API documentation in JSON.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_openapi_spec_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_openapi_spec,
+  - Paths used are get /organizations/{organizationId}/openapiSpec,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   version:
     description:
-    - Version query parameter. OpenAPI Specification version to return. Default is 2.
+      - Version query parameter. OpenAPI Specification version to return. Default
+        is 2.
     type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationOpenapiSpec
-  description: Complete reference of the getOrganizationOpenapiSpec API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-openapi-spec
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_openapi_spec,
-
-  - Paths used are
-    get /organizations/{organizationId}/openapiSpec,
+  - description: Complete reference of the getOrganizationOpenapiSpec API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-openapi-spec
+    name: Cisco Meraki documentation for organizations getOrganizationOpenapiSpec
+short_description: Information module for organizations _openapi _spec
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _openapi _spec
   cisco.meraki.organizations_openapi_spec_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     version: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_policy_objects.py b/plugins/modules/organizations_policy_objects.py
index d61a1de89..7df4eba45 100644
--- a/plugins/modules/organizations_policy_objects.py
+++ b/plugins/modules/organizations_policy_objects.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_policy_objects
-short_description: Resource module for organizations _policy _objects
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _policy _objects.
-- Creates a new Policy Object.
-- Deletes a Policy Object.
-- Updates a Policy Object.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _policy
+    _objects.
+  - Creates a new Policy Object.
+  - Deletes a Policy Object.
+  - Updates a Policy Object.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_policy_objects
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_policy_object,
+    organizations.Organizations.delete_organization_policy_object, organizations.Organizations.update_organization_policy_object,
+  - Paths used are post /organizations/{organizationId}/policyObjects, delete /organizations/{organizationId}/policyObjects/{policyObjectId},
+    put /organizations/{organizationId}/policyObjects/{policyObjectId},
 options:
   category:
     description: Category of a policy object (one of adaptivePolicy, network).
@@ -52,124 +55,113 @@
       ipAndMask).
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationPolicyObject
-  description: Complete reference of the createOrganizationPolicyObject API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-policy-object
-- name: Cisco Meraki documentation for organizations deleteOrganizationPolicyObject
-  description: Complete reference of the deleteOrganizationPolicyObject API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-policy-object
-- name: Cisco Meraki documentation for organizations updateOrganizationPolicyObject
-  description: Complete reference of the updateOrganizationPolicyObject API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-policy-object
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_policy_object,
-    organizations.Organizations.delete_organization_policy_object,
-    organizations.Organizations.update_organization_policy_object,
-
-  - Paths used are
-    post /organizations/{organizationId}/policyObjects,
-    delete /organizations/{organizationId}/policyObjects/{policyObjectId},
-    put /organizations/{organizationId}/policyObjects/{policyObjectId},
+  - description: Complete reference of the createOrganizationPolicyObject API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-policy-object
+    name: Cisco Meraki documentation for organizations createOrganizationPolicyObject
+  - description: Complete reference of the deleteOrganizationPolicyObject API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-policy-object
+    name: Cisco Meraki documentation for organizations deleteOrganizationPolicyObject
+  - description: Complete reference of the updateOrganizationPolicyObject API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-policy-object
+    name: Cisco Meraki documentation for organizations updateOrganizationPolicyObject
+short_description: Resource module for organizations _policy _objects
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_policy_objects:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     category: network
     cidr: 10.0.0.0/24
     fqdn: example.com
     groupIds:
-    - '8'
+      - '8'
     ip: 1.2.3.4
     mask: 255.255.0.0
     name: Web Servers - Datacenter 10
     organizationId: string
     type: cidr
-
 - name: Delete by id
   cisco.meraki.organizations_policy_objects:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     organizationId: string
     policyObjectId: string
-
 - name: Update by id
   cisco.meraki.organizations_policy_objects:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     cidr: 10.0.0.0/24
     fqdn: example.com
     groupIds:
-    - '8'
+      - '8'
     ip: 1.2.3.4
     mask: 255.255.0.0
     name: Web Servers - Datacenter 10
     organizationId: string
     policyObjectId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_policy_objects_groups.py b/plugins/modules/organizations_policy_objects_groups.py
index 293eb89a6..09acbb901 100644
--- a/plugins/modules/organizations_policy_objects_groups.py
+++ b/plugins/modules/organizations_policy_objects_groups.py
@@ -5,18 +5,22 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_policy_objects_groups
-short_description: Resource module for organizations _policy _objects _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _policy _objects _groups.
-- Creates a new Policy Object Group.
-- Deletes a Policy Object Group.
-- Updates a Policy Object Group.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _policy
+    _objects _groups.
+  - Creates a new Policy Object Group.
+  - Deletes a Policy Object Group.
+  - Updates a Policy Object Group.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_policy_objects_groups
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_policy_objects_group,
+    organizations.Organizations.delete_organization_policy_objects_group, organizations.Organizations.update_organization_policy_objects_group,
+  - Paths used are post /organizations/{organizationId}/policyObjects/groups, delete
+    /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId}, put
+    /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId},
 options:
   category:
     description: Category of a policy object group (one of NetworkObjectGroup, GeoLocationGroup,
@@ -27,8 +31,9 @@
       (alphanumeric, space, dash, or underscore characters only).
     type: str
   objectIds:
-    description: A list of Policy Object ID's that this NetworkObjectGroup should be
-      associated to (note these ID's will replace the existing associated Policy Objects).
+    description: A list of Policy Object ID's that this NetworkObjectGroup should
+      be associated to (note these ID's will replace the existing associated Policy
+      Objects).
     elements: int
     type: list
   organizationId:
@@ -38,115 +43,104 @@
     description: PolicyObjectGroupId path parameter. Policy object group ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationPolicyObjectsGroup
-  description: Complete reference of the createOrganizationPolicyObjectsGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-policy-objects-group
-- name: Cisco Meraki documentation for organizations deleteOrganizationPolicyObjectsGroup
-  description: Complete reference of the deleteOrganizationPolicyObjectsGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-policy-objects-group
-- name: Cisco Meraki documentation for organizations updateOrganizationPolicyObjectsGroup
-  description: Complete reference of the updateOrganizationPolicyObjectsGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-policy-objects-group
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_policy_objects_group,
-    organizations.Organizations.delete_organization_policy_objects_group,
-    organizations.Organizations.update_organization_policy_objects_group,
-
-  - Paths used are
-    post /organizations/{organizationId}/policyObjects/groups,
-    delete /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId},
-    put /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId},
+  - description: Complete reference of the createOrganizationPolicyObjectsGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-policy-objects-group
+    name: Cisco Meraki documentation for organizations createOrganizationPolicyObjectsGroup
+  - description: Complete reference of the deleteOrganizationPolicyObjectsGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-policy-objects-group
+    name: Cisco Meraki documentation for organizations deleteOrganizationPolicyObjectsGroup
+  - description: Complete reference of the updateOrganizationPolicyObjectsGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-policy-objects-group
+    name: Cisco Meraki documentation for organizations updateOrganizationPolicyObjectsGroup
+short_description: Resource module for organizations _policy _objects _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_policy_objects_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     category: NetworkObjectGroup
     name: Web Servers - Datacenter 10
     objectIds:
-    - 100
+      - 100
     organizationId: string
-
 - name: Delete by id
   cisco.meraki.organizations_policy_objects_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     organizationId: string
     policyObjectGroupId: string
-
 - name: Update by id
   cisco.meraki.organizations_policy_objects_groups:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: Web Servers - Datacenter 10
     objectIds:
-    - 100
+      - 100
     organizationId: string
     policyObjectGroupId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_policy_objects_groups_info.py b/plugins/modules/organizations_policy_objects_groups_info.py
index 25b5bf2e7..426a6ec8e 100644
--- a/plugins/modules/organizations_policy_objects_groups_info.py
+++ b/plugins/modules/organizations_policy_objects_groups_info.py
@@ -5,92 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_policy_objects_groups_info
-short_description: Information module for organizations _policy _objects _groups
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _policy _objects _groups.
-- Get organizations _policy _objects _groups by id.
-- Lists Policy Object Groups belonging to the organization.
-- Shows details of a Policy Object Group.
-version_added: '2.16.0'
+  - Get all organizations _policy _objects _groups.
+  - Get organizations _policy _objects _groups by id.
+  - Lists Policy Object Groups belonging to the organization.
+  - Shows details of a Policy Object Group.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_policy_objects_groups_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_policy_objects_group,
+    organizations.Organizations.get_organization_policy_objects_groups,
+  - Paths used are get /organizations/{organizationId}/policyObjects/groups, get /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId},
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 10 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 10 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+  policyObjectGroupId:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - PolicyObjectGroupId path parameter. Policy object group ID.
     type: str
-  policyObjectGroupId:
+  startingAfter:
     description:
-    - PolicyObjectGroupId path parameter. Policy object group ID.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationPolicyObjectsGroup
-  description: Complete reference of the getOrganizationPolicyObjectsGroup API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects-group
-- name: Cisco Meraki documentation for organizations getOrganizationPolicyObjectsGroups
-  description: Complete reference of the getOrganizationPolicyObjectsGroups API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects-groups
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_policy_objects_group,
-    organizations.Organizations.get_organization_policy_objects_groups,
-
-  - Paths used are
-    get /organizations/{organizationId}/policyObjects/groups,
-    get /organizations/{organizationId}/policyObjects/groups/{policyObjectGroupId},
+  - description: Complete reference of the getOrganizationPolicyObjectsGroup API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects-group
+    name: Cisco Meraki documentation for organizations getOrganizationPolicyObjectsGroup
+  - description: Complete reference of the getOrganizationPolicyObjectsGroups API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects-groups
+    name: Cisco Meraki documentation for organizations getOrganizationPolicyObjectsGroups
+short_description: Information module for organizations _policy _objects _groups
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _policy _objects _groups
   cisco.meraki.organizations_policy_objects_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -98,33 +100,31 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get organizations _policy _objects _groups by id
   cisco.meraki.organizations_policy_objects_groups_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     policyObjectGroupId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_policy_objects_info.py b/plugins/modules/organizations_policy_objects_info.py
index a5c96f54e..855633b11 100644
--- a/plugins/modules/organizations_policy_objects_info.py
+++ b/plugins/modules/organizations_policy_objects_info.py
@@ -5,92 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_policy_objects_info
-short_description: Information module for organizations _policy _objects
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _policy _objects.
-- Get organizations _policy _objects by id.
-- Lists Policy Objects belonging to the organization.
-- Shows details of a Policy Object.
-version_added: '2.16.0'
+  - Get all organizations _policy _objects.
+  - Get organizations _policy _objects by id.
+  - Lists Policy Objects belonging to the organization.
+  - Shows details of a Policy Object.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_policy_objects_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_policy_object,
+    organizations.Organizations.get_organization_policy_objects,
+  - Paths used are get /organizations/{organizationId}/policyObjects, get /organizations/{organizationId}/policyObjects/{policyObjectId},
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 10 - 5000. Default is 5000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 10 - 5000. Default is 5000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+  policyObjectId:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - PolicyObjectId path parameter. Policy object ID.
     type: str
-  policyObjectId:
+  startingAfter:
     description:
-    - PolicyObjectId path parameter. Policy object ID.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationPolicyObject
-  description: Complete reference of the getOrganizationPolicyObject API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-object
-- name: Cisco Meraki documentation for organizations getOrganizationPolicyObjects
-  description: Complete reference of the getOrganizationPolicyObjects API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_policy_object,
-    organizations.Organizations.get_organization_policy_objects,
-
-  - Paths used are
-    get /organizations/{organizationId}/policyObjects,
-    get /organizations/{organizationId}/policyObjects/{policyObjectId},
+  - description: Complete reference of the getOrganizationPolicyObject API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-object
+    name: Cisco Meraki documentation for organizations getOrganizationPolicyObject
+  - description: Complete reference of the getOrganizationPolicyObjects API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-policy-objects
+    name: Cisco Meraki documentation for organizations getOrganizationPolicyObjects
+short_description: Information module for organizations _policy _objects
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _policy _objects
   cisco.meraki.organizations_policy_objects_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -98,33 +100,31 @@
     total_pages: -1
     direction: next
   register: result
-
 - name: Get organizations _policy _objects by id
   cisco.meraki.organizations_policy_objects_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     policyObjectId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml.py b/plugins/modules/organizations_saml.py
index 3f9c5ecf0..1c222f7ff 100644
--- a/plugins/modules/organizations_saml.py
+++ b/plugins/modules/organizations_saml.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml
-short_description: Resource module for organizations _saml
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _saml.
-- Updates the SAML SSO enabled settings for an organization.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _saml.
+  - Updates the SAML SSO enabled settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_saml,
+  - Paths used are put /organizations/{organizationId}/saml,
 options:
   enabled:
     description: Boolean for updating SAML SSO enabled settings.
@@ -23,47 +23,42 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationSaml
-  description: Complete reference of the updateOrganizationSaml API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_saml,
-
-  - Paths used are
-    put /organizations/{organizationId}/saml,
+  - description: Complete reference of the updateOrganizationSaml API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml
+    name: Cisco Meraki documentation for organizations updateOrganizationSaml
+short_description: Resource module for organizations _saml
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_saml:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     enabled: true
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml_idps.py b/plugins/modules/organizations_saml_idps.py
index f141154af..aff28eb59 100644
--- a/plugins/modules/organizations_saml_idps.py
+++ b/plugins/modules/organizations_saml_idps.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml_idps
-short_description: Resource module for organizations _saml _idps
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _saml _idps.
-- Create a SAML IdP for your organization.
-- Remove a SAML IdP in your organization.
-- Update a SAML IdP in your organization.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _saml
+    _idps.
+  - Create a SAML IdP for your organization.
+  - Remove a SAML IdP in your organization.
+  - Update a SAML IdP in your organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml_idps
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_saml_idp,
+    organizations.Organizations.delete_organization_saml_idp, organizations.Organizations.update_organization_saml_idp,
+  - Paths used are post /organizations/{organizationId}/saml/idps, delete /organizations/{organizationId}/saml/idps/{idpId},
+    put /organizations/{organizationId}/saml/idps/{idpId},
 options:
   idpId:
     description: IdpId path parameter. Idp ID.
@@ -32,112 +35,101 @@
       Provider (IdP). This will be used for encryption / validation.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationSamlIdp
-  description: Complete reference of the createOrganizationSamlIdp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-saml-idp
-- name: Cisco Meraki documentation for organizations deleteOrganizationSamlIdp
-  description: Complete reference of the deleteOrganizationSamlIdp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-saml-idp
-- name: Cisco Meraki documentation for organizations updateOrganizationSamlIdp
-  description: Complete reference of the updateOrganizationSamlIdp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml-idp
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_saml_idp,
-    organizations.Organizations.delete_organization_saml_idp,
-    organizations.Organizations.update_organization_saml_idp,
-
-  - Paths used are
-    post /organizations/{organizationId}/saml/idps,
-    delete /organizations/{organizationId}/saml/idps/{idpId},
-    put /organizations/{organizationId}/saml/idps/{idpId},
+  - description: Complete reference of the createOrganizationSamlIdp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-saml-idp
+    name: Cisco Meraki documentation for organizations createOrganizationSamlIdp
+  - description: Complete reference of the deleteOrganizationSamlIdp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-saml-idp
+    name: Cisco Meraki documentation for organizations deleteOrganizationSamlIdp
+  - description: Complete reference of the updateOrganizationSamlIdp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml-idp
+    name: Cisco Meraki documentation for organizations updateOrganizationSamlIdp
+short_description: Resource module for organizations _saml _idps
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_saml_idps:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     organizationId: string
     sloLogoutUrl: https://somewhere.com
     x509certSha1Fingerprint: 00:11:22:33:44:55:66:77:88:99:00:11:22:33:44:55:66:77:88:99
-
 - name: Delete by id
   cisco.meraki.organizations_saml_idps:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     idpId: string
     organizationId: string
-
 - name: Update by id
   cisco.meraki.organizations_saml_idps:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     idpId: string
     organizationId: string
     sloLogoutUrl: https://somewhere.com
     x509certSha1Fingerprint: 00:11:22:33:44:55:66:77:88:99:00:11:22:33:44:55:66:77:88:99
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml_idps_info.py b/plugins/modules/organizations_saml_idps_info.py
index 8845b0156..404d47c90 100644
--- a/plugins/modules/organizations_saml_idps_info.py
+++ b/plugins/modules/organizations_saml_idps_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml_idps_info
-short_description: Information module for organizations _saml _idps
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _saml _idps.
-- Get organizations _saml _idps by id.
-- Get a SAML IdP from your organization.
-- List the SAML IdPs in your organization.
-version_added: '2.16.0'
+  - Get all organizations _saml _idps.
+  - Get organizations _saml _idps by id.
+  - Get a SAML IdP from your organization.
+  - List the SAML IdPs in your organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml_idps_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_saml_idp, organizations.Organizations.get_organization_saml_idps,
+  - Paths used are get /organizations/{organizationId}/saml/idps, get /organizations/{organizationId}/saml/idps/{idpId},
 options:
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  idpId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - IdpId path parameter. Idp ID.
     type: str
-  idpId:
+  organizationId:
     description:
-    - IdpId path parameter. Idp ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSamlIdp
-  description: Complete reference of the getOrganizationSamlIdp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-idp
-- name: Cisco Meraki documentation for organizations getOrganizationSamlIdps
-  description: Complete reference of the getOrganizationSamlIdps API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-idps
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_saml_idp,
-    organizations.Organizations.get_organization_saml_idps,
-
-  - Paths used are
-    get /organizations/{organizationId}/saml/idps,
-    get /organizations/{organizationId}/saml/idps/{idpId},
+  - description: Complete reference of the getOrganizationSamlIdp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-idp
+    name: Cisco Meraki documentation for organizations getOrganizationSamlIdp
+  - description: Complete reference of the getOrganizationSamlIdps API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-idps
+    name: Cisco Meraki documentation for organizations getOrganizationSamlIdps
+short_description: Information module for organizations _saml _idps
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _saml _idps
   cisco.meraki.organizations_saml_idps_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _saml _idps by id
   cisco.meraki.organizations_saml_idps_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     idpId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml_info.py b/plugins/modules/organizations_saml_info.py
index 0b3c33b4a..fcd7102ea 100644
--- a/plugins/modules/organizations_saml_info.py
+++ b/plugins/modules/organizations_saml_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml_info
-short_description: Information module for organizations _saml
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _saml.
-- Returns the SAML SSO enabled settings for an organization.
-version_added: '2.16.0'
+  - Get all organizations _saml.
+  - Returns the SAML SSO enabled settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_saml,
+  - Paths used are get /organizations/{organizationId}/saml,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSaml
-  description: Complete reference of the getOrganizationSaml API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_saml,
-
-  - Paths used are
-    get /organizations/{organizationId}/saml,
+  - description: Complete reference of the getOrganizationSaml API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml
+    name: Cisco Meraki documentation for organizations getOrganizationSaml
+short_description: Information module for organizations _saml
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _saml
   cisco.meraki.organizations_saml_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml_roles.py b/plugins/modules/organizations_saml_roles.py
index a19ebda86..5a440c5e9 100644
--- a/plugins/modules/organizations_saml_roles.py
+++ b/plugins/modules/organizations_saml_roles.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml_roles
-short_description: Resource module for organizations _saml _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _saml _roles.
-- Create a SAML role.
-- Remove a SAML role.
-- Update a SAML role.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _saml
+    _roles.
+  - Create a SAML role.
+  - Remove a SAML role.
+  - Update a SAML role.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml_roles
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_saml_role,
+    organizations.Organizations.delete_organization_saml_role, organizations.Organizations.update_organization_saml_role,
+  - Paths used are post /organizations/{organizationId}/samlRoles, delete /organizations/{organizationId}/samlRoles/{samlRoleId},
+    put /organizations/{organizationId}/samlRoles/{samlRoleId},
 options:
   networks:
     description: The list of networks that the SAML administrator has privileges on.
@@ -32,8 +35,8 @@
         type: str
     type: list
   orgAccess:
-    description: The privilege of the SAML administrator on the organization. Can be
-      one of 'none', 'read-only', 'full' or 'enterprise'.
+    description: The privilege of the SAML administrator on the organization. Can
+      be one of 'none', 'read-only', 'full' or 'enterprise'.
     type: str
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -57,124 +60,113 @@
         type: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationSamlRole
-  description: Complete reference of the createOrganizationSamlRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-saml-role
-- name: Cisco Meraki documentation for organizations deleteOrganizationSamlRole
-  description: Complete reference of the deleteOrganizationSamlRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-saml-role
-- name: Cisco Meraki documentation for organizations updateOrganizationSamlRole
-  description: Complete reference of the updateOrganizationSamlRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml-role
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_saml_role,
-    organizations.Organizations.delete_organization_saml_role,
-    organizations.Organizations.update_organization_saml_role,
-
-  - Paths used are
-    post /organizations/{organizationId}/samlRoles,
-    delete /organizations/{organizationId}/samlRoles/{samlRoleId},
-    put /organizations/{organizationId}/samlRoles/{samlRoleId},
+  - description: Complete reference of the createOrganizationSamlRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-saml-role
+    name: Cisco Meraki documentation for organizations createOrganizationSamlRole
+  - description: Complete reference of the deleteOrganizationSamlRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-saml-role
+    name: Cisco Meraki documentation for organizations deleteOrganizationSamlRole
+  - description: Complete reference of the updateOrganizationSamlRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-saml-role
+    name: Cisco Meraki documentation for organizations updateOrganizationSamlRole
+short_description: Resource module for organizations _saml _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_saml_roles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networks:
-    - access: full
-      id: N_24329156
+      - access: full
+        id: N_24329156
     orgAccess: none
     organizationId: string
     role: myrole
     tags:
-    - access: read-only
-      tag: west
-
+      - access: read-only
+        tag: west
 - name: Delete by id
   cisco.meraki.organizations_saml_roles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     organizationId: string
     samlRoleId: string
-
 - name: Update by id
   cisco.meraki.organizations_saml_roles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     networks:
-    - access: full
-      id: N_24329156
+      - access: full
+        id: N_24329156
     orgAccess: none
     organizationId: string
     role: myrole
     samlRoleId: string
     tags:
-    - access: read-only
-      tag: west
-
+      - access: read-only
+        tag: west
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_saml_roles_info.py b/plugins/modules/organizations_saml_roles_info.py
index a4e231085..3aacfcc88 100644
--- a/plugins/modules/organizations_saml_roles_info.py
+++ b/plugins/modules/organizations_saml_roles_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_saml_roles_info
-short_description: Information module for organizations _saml _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _saml _roles.
-- Get organizations _saml _roles by id.
-- List the SAML roles for this organization.
-- Return a SAML role.
-version_added: '2.16.0'
+  - Get all organizations _saml _roles.
+  - Get organizations _saml _roles by id.
+  - List the SAML roles for this organization.
+  - Return a SAML role.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_saml_roles_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_saml_role, organizations.Organizations.get_organization_saml_roles,
+  - Paths used are get /organizations/{organizationId}/samlRoles, get /organizations/{organizationId}/samlRoles/{samlRoleId},
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   samlRoleId:
     description:
-    - SamlRoleId path parameter. Saml role ID.
+      - SamlRoleId path parameter. Saml role ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSamlRole
-  description: Complete reference of the getOrganizationSamlRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-role
-- name: Cisco Meraki documentation for organizations getOrganizationSamlRoles
-  description: Complete reference of the getOrganizationSamlRoles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-roles
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_saml_role,
-    organizations.Organizations.get_organization_saml_roles,
-
-  - Paths used are
-    get /organizations/{organizationId}/samlRoles,
-    get /organizations/{organizationId}/samlRoles/{samlRoleId},
+  - description: Complete reference of the getOrganizationSamlRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-role
+    name: Cisco Meraki documentation for organizations getOrganizationSamlRole
+  - description: Complete reference of the getOrganizationSamlRoles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-saml-roles
+    name: Cisco Meraki documentation for organizations getOrganizationSamlRoles
+short_description: Information module for organizations _saml _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _saml _roles
   cisco.meraki.organizations_saml_roles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _saml _roles by id
   cisco.meraki.organizations_saml_roles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     samlRoleId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sensor_readings_history_info.py b/plugins/modules/organizations_sensor_readings_history_info.py
index 1f0853dde..733557898 100644
--- a/plugins/modules/organizations_sensor_readings_history_info.py
+++ b/plugins/modules/organizations_sensor_readings_history_info.py
@@ -5,117 +5,126 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sensor_readings_history_info
-short_description: Information module for organizations _sensor _readings _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sensor _readings _history.
-- Return all reported readings from sensors in a given timespan, sorted by timestamp.
-version_added: '2.16.0'
+  - Get all organizations _sensor _readings _history.
+  - Return all reported readings from sensors in a given timespan, sorted by timestamp.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_sensor_readings_history_info
+notes:
+  - SDK Method used are sensor.Sensor.get_organization_sensor_readings_history,
+  - Paths used are get /organizations/{organizationId}/sensor/readings/history,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  metrics:
+    description:
+      - 'Metrics query parameter. Types of sensor readings to retrieve. If no metrics
+        are supplied, all available types of readings will be retrieved. Allowed values
+        are apparentPower, battery, button, co2, current, door, downstreamPower, frequency,
+        humidity, indoorAirQuality, noise, pm25, powerFactor, realPower, remoteLockoutSwitch,
+        temperature, tvoc, voltage, and water.
+
+        '
+    elements: str
+    type: list
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter readings by network.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Serials query parameter. Optional parameter to filter readings by sensor.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - >
-      T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 365 days and
-      6 hours from today.
+      - 'T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 365 days and 6 hours from today.
+
+        '
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 7 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 7 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 7 days. The
-      default is 2 hours.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 7 days. The default
+        is 2 hours.
+
+        '
     type: float
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter readings by network.
-    elements: str
-    type: list
-  serials:
-    description:
-    - Serials query parameter. Optional parameter to filter readings by sensor.
-    elements: str
-    type: list
-  metrics:
-    description:
-    - >
-      Metrics query parameter. Types of sensor readings to retrieve. If no metrics are supplied, all available
-      types of readings will be retrieved. Allowed values are apparentPower, battery, button, co2, current, door,
-      downstreamPower, frequency, humidity, indoorAirQuality, noise, pm25, powerFactor, realPower,
-      remoteLockoutSwitch, temperature, tvoc, voltage, and water.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getOrganizationSensorReadingsHistory
-  description: Complete reference of the getOrganizationSensorReadingsHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sensor-readings-history
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_organization_sensor_readings_history,
-
-  - Paths used are
-    get /organizations/{organizationId}/sensor/readings/history,
+  - description: Complete reference of the getOrganizationSensorReadingsHistory API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sensor-readings-history
+    name: Cisco Meraki documentation for sensor getOrganizationSensorReadingsHistory
+short_description: Information module for organizations _sensor _readings _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sensor _readings _history
   cisco.meraki.organizations_sensor_readings_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -129,7 +138,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sensor_readings_latest_info.py b/plugins/modules/organizations_sensor_readings_latest_info.py
index 26dfe95f5..99c0f1ff9 100644
--- a/plugins/modules/organizations_sensor_readings_latest_info.py
+++ b/plugins/modules/organizations_sensor_readings_latest_info.py
@@ -5,100 +5,106 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sensor_readings_latest_info
-short_description: Information module for organizations _sensor _readings _latest
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sensor _readings _latest.
-- Return the latest available reading for each metric from each sensor, sorted by sensor serial.
-version_added: '2.16.0'
+  - Get all organizations _sensor _readings _latest.
+  - Return the latest available reading for each metric from each sensor, sorted by
+    sensor serial.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_sensor_readings_latest_info
+notes:
+  - SDK Method used are sensor.Sensor.get_organization_sensor_readings_latest,
+  - Paths used are get /organizations/{organizationId}/sensor/readings/latest,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  metrics:
+    description:
+      - 'Metrics query parameter. Types of sensor readings to retrieve. If no metrics
+        are supplied, all available types of readings will be retrieved. Allowed values
+        are apparentPower, battery, button, co2, current, door, downstreamPower, frequency,
+        humidity, indoorAirQuality, noise, pm25, powerFactor, realPower, remoteLockoutSwitch,
+        temperature, tvoc, voltage, and water.
+
+        '
+    elements: str
+    type: list
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter readings by network.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter readings by network.
-    elements: str
-    type: list
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter readings by sensor.
+      - Serials query parameter. Optional parameter to filter readings by sensor.
     elements: str
     type: list
-  metrics:
+  startingAfter:
     description:
-    - >
-      Metrics query parameter. Types of sensor readings to retrieve. If no metrics are supplied, all available
-      types of readings will be retrieved. Allowed values are apparentPower, battery, button, co2, current, door,
-      downstreamPower, frequency, humidity, indoorAirQuality, noise, pm25, powerFactor, realPower,
-      remoteLockoutSwitch, temperature, tvoc, voltage, and water.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sensor getOrganizationSensorReadingsLatest
-  description: Complete reference of the getOrganizationSensorReadingsLatest API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sensor-readings-latest
-notes:
-  - SDK Method used are
-    sensor.Sensor.get_organization_sensor_readings_latest,
-
-  - Paths used are
-    get /organizations/{organizationId}/sensor/readings/latest,
+  - description: Complete reference of the getOrganizationSensorReadingsLatest API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sensor-readings-latest
+    name: Cisco Meraki documentation for sensor getOrganizationSensorReadingsLatest
+short_description: Information module for organizations _sensor _readings _latest
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sensor _readings _latest
   cisco.meraki.organizations_sensor_readings_latest_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -109,7 +115,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_admins_roles.py b/plugins/modules/organizations_sm_admins_roles.py
index 3794582c7..614b15288 100644
--- a/plugins/modules/organizations_sm_admins_roles.py
+++ b/plugins/modules/organizations_sm_admins_roles.py
@@ -5,16 +5,17 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_admins_roles
-short_description: Resource module for organizations _sm _admins _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create, update and delete of the resource organizations _sm _admins _roles.
-- Create a Limited Access Role.
-version_added: '2.16.0'
+  - Manage operations create, update and delete of the resource organizations _sm
+    _admins _roles.
+  - Create a Limited Access Role.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_admins_roles
+notes:
+  - SDK Method used are sm.Sm.create_organization_sm_admins_role,
+  - Paths used are post /organizations/{organizationId}/sm/admins/roles,
 options:
   name:
     description: The name of the Limited Access Role.
@@ -30,50 +31,45 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm createOrganizationSmAdminsRole
-  description: Complete reference of the createOrganizationSmAdminsRole API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-sm-admins-role
-notes:
-  - SDK Method used are
-    sm.Sm.create_organization_sm_admins_role,
-
-  - Paths used are
-    post /organizations/{organizationId}/sm/admins/roles,
+  - description: Complete reference of the createOrganizationSmAdminsRole API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-sm-admins-role
+    name: Cisco Meraki documentation for sm createOrganizationSmAdminsRole
+short_description: Resource module for organizations _sm _admins _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_sm_admins_roles:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     name: sample name
     organizationId: string
     scope: all_tags
     tags:
-    - tag
-
+      - tag
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_admins_roles_info.py b/plugins/modules/organizations_sm_admins_roles_info.py
index 3a9d5ed9a..2582b5bd3 100644
--- a/plugins/modules/organizations_sm_admins_roles_info.py
+++ b/plugins/modules/organizations_sm_admins_roles_info.py
@@ -5,81 +5,84 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_admins_roles_info
-short_description: Information module for organizations _sm _admins _roles
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sm _admins _roles.
-- List the Limited Access Roles for an organization.
-version_added: '2.16.0'
+  - Get all organizations _sm _admins _roles.
+  - List the Limited Access Roles for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_admins_roles_info
+notes:
+  - SDK Method used are sm.Sm.get_organization_sm_admins_roles,
+  - Paths used are get /organizations/{organizationId}/sm/admins/roles,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getOrganizationSmAdminsRoles
-  description: Complete reference of the getOrganizationSmAdminsRoles API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-admins-roles
-notes:
-  - SDK Method used are
-    sm.Sm.get_organization_sm_admins_roles,
-
-  - Paths used are
-    get /organizations/{organizationId}/sm/admins/roles,
+  - description: Complete reference of the getOrganizationSmAdminsRoles API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-admins-roles
+    name: Cisco Meraki documentation for sm getOrganizationSmAdminsRoles
+short_description: Information module for organizations _sm _admins _roles
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sm _admins _roles
   cisco.meraki.organizations_sm_admins_roles_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -87,7 +90,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_apns_cert_info.py b/plugins/modules/organizations_sm_apns_cert_info.py
index 88ccffd7d..199cc1bb1 100644
--- a/plugins/modules/organizations_sm_apns_cert_info.py
+++ b/plugins/modules/organizations_sm_apns_cert_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_apns_cert_info
-short_description: Information module for organizations _sm _apns _cert
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sm _apns _cert.
-- Get the organization's APNS certificate.
-version_added: '2.16.0'
+  - Get all organizations _sm _apns _cert.
+  - Get the organization's APNS certificate.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_apns_cert_info
+notes:
+  - SDK Method used are sm.Sm.get_organization_sm_apns_cert,
+  - Paths used are get /organizations/{organizationId}/sm/apnsCert,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getOrganizationSmApnsCert
-  description: Complete reference of the getOrganizationSmApnsCert API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-apns-cert
-notes:
-  - SDK Method used are
-    sm.Sm.get_organization_sm_apns_cert,
-
-  - Paths used are
-    get /organizations/{organizationId}/sm/apnsCert,
+  - description: Complete reference of the getOrganizationSmApnsCert API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-apns-cert
+    name: Cisco Meraki documentation for sm getOrganizationSmApnsCert
+short_description: Information module for organizations _sm _apns _cert
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sm _apns _cert
   cisco.meraki.organizations_sm_apns_cert_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_sentry_policies_assignments.py b/plugins/modules/organizations_sm_sentry_policies_assignments.py
index e983f92f8..9c5694b82 100644
--- a/plugins/modules/organizations_sm_sentry_policies_assignments.py
+++ b/plugins/modules/organizations_sm_sentry_policies_assignments.py
@@ -5,19 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_sentry_policies_assignments
-short_description: Resource module for organizations _sm _sentry _policies _assignments
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _sm _sentry _policies _assignments.
-- >
-   Update an Organizations Sentry Policies using the provided list. Sentry Policies are ordered in descending order
-   of priority i.e. Highest priority at the bottom, this is opposite the Dashboard UI. Policies not present in the
-   request will be deleted.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _sm _sentry _policies _assignments.
+  - 'Update an Organizations Sentry Policies using the provided list. Sentry Policies
+    are ordered in descending order of priority i.e. Highest priority at the bottom,
+    this is opposite the Dashboard UI. Policies not present in the request will be
+    deleted.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_sentry_policies_assignments
+notes:
+  - SDK Method used are sm.Sm.update_organization_sm_sentry_policies_assignments,
+  - Paths used are put /organizations/{organizationId}/sm/sentry/policies/assignments,
 options:
   items:
     description: Sentry Group Policies for the Organization keyed by Network Id.
@@ -52,55 +54,51 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm updateOrganizationSmSentryPoliciesAssignments
-  description: Complete reference of the updateOrganizationSmSentryPoliciesAssignments API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-sm-sentry-policies-assignments
-notes:
-  - SDK Method used are
-    sm.Sm.update_organization_sm_sentry_policies_assignments,
-
-  - Paths used are
-    put /organizations/{organizationId}/sm/sentry/policies/assignments,
+  - description: Complete reference of the updateOrganizationSmSentryPoliciesAssignments
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-sm-sentry-policies-assignments
+    name: Cisco Meraki documentation for sm updateOrganizationSmSentryPoliciesAssignments
+short_description: Resource module for organizations _sm _sentry _policies _assignments
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_sm_sentry_policies_assignments:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     items:
-    - networkId: N_24329156
-      policies:
-      - groupPolicyId: '1284392014819'
-        policyId: '1284392014819'
-        scope: withAny
-        smNetworkId: N_24329156
-        tags:
-        - tag1
-        - tag2
+      - networkId: N_24329156
+        policies:
+          - groupPolicyId: '1284392014819'
+            policyId: '1284392014819'
+            scope: withAny
+            smNetworkId: N_24329156
+            tags:
+              - tag1
+              - tag2
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_sentry_policies_assignments_by_network_info.py b/plugins/modules/organizations_sm_sentry_policies_assignments_by_network_info.py
index 3c4012f1a..f2c55406c 100644
--- a/plugins/modules/organizations_sm_sentry_policies_assignments_by_network_info.py
+++ b/plugins/modules/organizations_sm_sentry_policies_assignments_by_network_info.py
@@ -5,86 +5,92 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_sentry_policies_assignments_by_network_info
-short_description: Information module for organizations _sm _sentry _policies _assignments _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sm _sentry _policies _assignments _by _network.
-- List the Sentry Policies for an organization ordered in ascending order of priority.
-version_added: '2.16.0'
+  - Get all organizations _sm _sentry _policies _assignments _by _network.
+  - List the Sentry Policies for an organization ordered in ascending order of priority.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_sentry_policies_assignments_by_network_info
+notes:
+  - SDK Method used are sm.Sm.get_organization_sm_sentry_policies_assignments_by_network,
+  - Paths used are get /organizations/{organizationId}/sm/sentry/policies/assignments/byNetwork,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - NetworkIds query parameter. Optional parameter to filter Sentry Policies by
+        Network Id.
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
-    description:
-    - NetworkIds query parameter. Optional parameter to filter Sentry Policies by Network Id.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getOrganizationSmSentryPoliciesAssignmentsByNetwork
-  description: Complete reference of the getOrganizationSmSentryPoliciesAssignmentsByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-sentry-policies-assignments-by-network
-notes:
-  - SDK Method used are
-    sm.Sm.get_organization_sm_sentry_policies_assignments_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/sm/sentry/policies/assignments/byNetwork,
+  - description: Complete reference of the getOrganizationSmSentryPoliciesAssignmentsByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-sentry-policies-assignments-by-network
+    name: Cisco Meraki documentation for sm getOrganizationSmSentryPoliciesAssignmentsByNetwork
+short_description: Information module for organizations _sm _sentry _policies _assignments
+  _by _network
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sm _sentry _policies _assignments _by _network
   cisco.meraki.organizations_sm_sentry_policies_assignments_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -93,7 +99,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_sm_vpp_accounts_info.py b/plugins/modules/organizations_sm_vpp_accounts_info.py
index 707aa5c09..8f85381e5 100644
--- a/plugins/modules/organizations_sm_vpp_accounts_info.py
+++ b/plugins/modules/organizations_sm_vpp_accounts_info.py
@@ -5,102 +5,94 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_sm_vpp_accounts_info
-short_description: Information module for organizations _sm _vpp _accounts
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _sm _vpp _accounts.
-- Get organizations _sm _vpp _accounts by id.
-- Get a hash containing the unparsed token of the VPP account with the given ID.
-- List the VPP accounts in the organization.
-version_added: '2.16.0'
+  - Get all organizations _sm _vpp _accounts.
+  - Get organizations _sm _vpp _accounts by id.
+  - Get a hash containing the unparsed token of the VPP account with the given ID.
+  - List the VPP accounts in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_sm_vpp_accounts_info
+notes:
+  - SDK Method used are sm.Sm.get_organization_sm_vpp_account, sm.Sm.get_organization_sm_vpp_accounts,
+  - Paths used are get /organizations/{organizationId}/sm/vppAccounts, get /organizations/{organizationId}/sm/vppAccounts/{vppAccountId},
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   vppAccountId:
     description:
-    - VppAccountId path parameter. Vpp account ID.
+      - VppAccountId path parameter. Vpp account ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for sm getOrganizationSmVppAccount
-  description: Complete reference of the getOrganizationSmVppAccount API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-vpp-account
-- name: Cisco Meraki documentation for sm getOrganizationSmVppAccounts
-  description: Complete reference of the getOrganizationSmVppAccounts API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-vpp-accounts
-notes:
-  - SDK Method used are
-    sm.Sm.get_organization_sm_vpp_account,
-    sm.Sm.get_organization_sm_vpp_accounts,
-
-  - Paths used are
-    get /organizations/{organizationId}/sm/vppAccounts,
-    get /organizations/{organizationId}/sm/vppAccounts/{vppAccountId},
+  - description: Complete reference of the getOrganizationSmVppAccount API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-vpp-account
+    name: Cisco Meraki documentation for sm getOrganizationSmVppAccount
+  - description: Complete reference of the getOrganizationSmVppAccounts API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-sm-vpp-accounts
+    name: Cisco Meraki documentation for sm getOrganizationSmVppAccounts
+short_description: Information module for organizations _sm _vpp _accounts
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _sm _vpp _accounts
   cisco.meraki.organizations_sm_vpp_accounts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 - name: Get organizations _sm _vpp _accounts by id
   cisco.meraki.organizations_sm_vpp_accounts_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     vppAccountId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_snmp.py b/plugins/modules/organizations_snmp.py
index 2ada45f40..78810e7df 100644
--- a/plugins/modules/organizations_snmp.py
+++ b/plugins/modules/organizations_snmp.py
@@ -5,16 +5,16 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_snmp
-short_description: Resource module for organizations _snmp
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation update of the resource organizations _snmp.
-- Update the SNMP settings for an organization.
-version_added: '2.16.0'
+  - Manage operation update of the resource organizations _snmp.
+  - Update the SNMP settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_snmp
+notes:
+  - SDK Method used are organizations.Organizations.update_organization_snmp,
+  - Paths used are put /organizations/{organizationId}/snmp,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -44,54 +44,49 @@
       if specified.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations updateOrganizationSnmp
-  description: Complete reference of the updateOrganizationSnmp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!update-organization-snmp
-notes:
-  - SDK Method used are
-    organizations.Organizations.update_organization_snmp,
-
-  - Paths used are
-    put /organizations/{organizationId}/snmp,
+  - description: Complete reference of the updateOrganizationSnmp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!update-organization-snmp
+    name: Cisco Meraki documentation for organizations updateOrganizationSnmp
+short_description: Resource module for organizations _snmp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Update all
   cisco.meraki.organizations_snmp:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     organizationId: string
     peerIps:
-    - 123.123.123.1
+      - 123.123.123.1
     v2cEnabled: false
     v3AuthMode: SHA
     v3AuthPass: password
     v3Enabled: true
     v3PrivMode: AES128
     v3PrivPass: password
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_snmp_info.py b/plugins/modules/organizations_snmp_info.py
index 9447c4c70..e11c19929 100644
--- a/plugins/modules/organizations_snmp_info.py
+++ b/plugins/modules/organizations_snmp_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_snmp_info
-short_description: Information module for organizations _snmp
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _snmp.
-- Return the SNMP settings for an organization.
-version_added: '2.16.0'
+  - Get all organizations _snmp.
+  - Return the SNMP settings for an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_snmp_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_snmp,
+  - Paths used are get /organizations/{organizationId}/snmp,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSnmp
-  description: Complete reference of the getOrganizationSnmp API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-snmp
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_snmp,
-
-  - Paths used are
-    get /organizations/{organizationId}/snmp,
+  - description: Complete reference of the getOrganizationSnmp API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-snmp
+    name: Cisco Meraki documentation for organizations getOrganizationSnmp
+short_description: Information module for organizations _snmp
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _snmp
   cisco.meraki.organizations_snmp_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_splash_themes.py b/plugins/modules/organizations_splash_themes.py
index 4c231bb73..2a8ecb956 100644
--- a/plugins/modules/organizations_splash_themes.py
+++ b/plugins/modules/organizations_splash_themes.py
@@ -5,17 +5,18 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_splash_themes
-short_description: Resource module for organizations _splash _themes
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operations create and delete of the resource organizations _splash _themes.
-- Create a Splash Theme.
-- Delete a Splash Theme.
-version_added: '2.16.0'
+  - Manage operations create and delete of the resource organizations _splash _themes.
+  - Create a Splash Theme.
+  - Delete a Splash Theme.
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_splash_themes
+notes:
+  - SDK Method used are organizations.Organizations.create_organization_splash_theme,
+    organizations.Organizations.delete_organization_splash_theme,
+  - Paths used are post /organizations/{organizationId}/splash/themes, delete /organizations/{organizationId}/splash/themes/{id},
 options:
   baseTheme:
     description: Base theme id.
@@ -30,79 +31,71 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations createOrganizationSplashTheme
-  description: Complete reference of the createOrganizationSplashTheme API.
-  link: https://developer.cisco.com/meraki/api-v1/#!create-organization-splash-theme
-- name: Cisco Meraki documentation for organizations deleteOrganizationSplashTheme
-  description: Complete reference of the deleteOrganizationSplashTheme API.
-  link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-splash-theme
-notes:
-  - SDK Method used are
-    organizations.Organizations.create_organization_splash_theme,
-    organizations.Organizations.delete_organization_splash_theme,
-
-  - Paths used are
-    post /organizations/{organizationId}/splash/themes,
-    delete /organizations/{organizationId}/splash/themes/{id},
+  - description: Complete reference of the createOrganizationSplashTheme API.
+    link: https://developer.cisco.com/meraki/api-v1/#!create-organization-splash-theme
+    name: Cisco Meraki documentation for organizations createOrganizationSplashTheme
+  - description: Complete reference of the deleteOrganizationSplashTheme API.
+    link: https://developer.cisco.com/meraki/api-v1/#!delete-organization-splash-theme
+    name: Cisco Meraki documentation for organizations deleteOrganizationSplashTheme
+short_description: Resource module for organizations _splash _themes
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_splash_themes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: present
     baseTheme: string
     name: string
     organizationId: string
-
 - name: Delete by id
   cisco.meraki.organizations_splash_themes:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     state: absent
     id: string
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_splash_themes_info.py b/plugins/modules/organizations_splash_themes_info.py
index dbe35b3fa..650bdcf55 100644
--- a/plugins/modules/organizations_splash_themes_info.py
+++ b/plugins/modules/organizations_splash_themes_info.py
@@ -5,65 +5,60 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_splash_themes_info
-short_description: Information module for organizations _splash _themes
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _splash _themes.
-- List Splash Themes.
-version_added: '2.20.0'
+  - Get all organizations _splash _themes.
+  - List Splash Themes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_splash_themes_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_splash_themes,
+  - Paths used are get /organizations/{organizationId}/splash/themes,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSplashThemes
-  description: Complete reference of the getOrganizationSplashThemes API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-splash-themes
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_splash_themes,
-
-  - Paths used are
-    get /organizations/{organizationId}/splash/themes,
+  - description: Complete reference of the getOrganizationSplashThemes API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-splash-themes
+    name: Cisco Meraki documentation for organizations getOrganizationSplashThemes
+short_description: Information module for organizations _splash _themes
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _splash _themes
   cisco.meraki.organizations_splash_themes_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_appliances_by_utilization_info.py b/plugins/modules/organizations_summary_top_appliances_by_utilization_info.py
index fd627e9a5..dd6ef384c 100644
--- a/plugins/modules/organizations_summary_top_appliances_by_utilization_info.py
+++ b/plugins/modules/organizations_summary_top_appliances_by_utilization_info.py
@@ -5,97 +5,99 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_appliances_by_utilization_info
-short_description: Information module for organizations _summary _top _appliances _by _utilization
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _appliances _by _utilization.
-- Return the top 10 appliances sorted by utilization over given time range.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _appliances _by _utilization.
+  - Return the top 10 appliances sorted by utilization over given time range.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_appliances_by_utilization_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_appliances_by_utilization,
+  - Paths used are get /organizations/{organizationId}/summary/top/appliances/byUtilization,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes
-      and be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 25 minutes and be
+        less than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopAppliancesByUtilization
-  description: Complete reference of the getOrganizationSummaryTopAppliancesByUtilization API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-appliances-by-utilization
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_appliances_by_utilization,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/appliances/byUtilization,
+  - description: Complete reference of the getOrganizationSummaryTopAppliancesByUtilization
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-appliances-by-utilization
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopAppliancesByUtilization
+short_description: Information module for organizations _summary _top _appliances
+  _by _utilization
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _appliances _by _utilization
   cisco.meraki.organizations_summary_top_appliances_by_utilization_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -106,7 +108,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_applications_by_usage_info.py b/plugins/modules/organizations_summary_top_applications_by_usage_info.py
index 58441c8df..82cbd2a6e 100644
--- a/plugins/modules/organizations_summary_top_applications_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_applications_by_usage_info.py
@@ -5,101 +5,104 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_applications_by_usage_info
-short_description: Information module for organizations _summary _top _applications _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _applications _by _usage.
-- Return the top applications sorted by data usage over given time range. Default unit is megabytes.
-version_added: '2.20.0'
+  - Get all organizations _summary _top _applications _by _usage.
+  - Return the top applications sorted by data usage over given time range. Default
+    unit is megabytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_applications_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_applications_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/applications/byUsage,
 options:
+  device:
+    description:
+      - Device query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  networkId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - NetworkId query parameter. Match result to an exact network id.
     type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
-    type: str
-  device:
-    description:
-    - Device query parameter. Match result to an exact device tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  networkId:
+  organizationId:
     description:
-    - NetworkId query parameter. Match result to an exact network id.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes
-      and be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 25 minutes and be
+        less than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopApplicationsByUsage
-  description: Complete reference of the getOrganizationSummaryTopApplicationsByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-applications-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_applications_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/applications/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopApplicationsByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-applications-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopApplicationsByUsage
+short_description: Information module for organizations _summary _top _applications
+  _by _usage
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _applications _by _usage
   cisco.meraki.organizations_summary_top_applications_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     device: string
     networkId: string
@@ -111,7 +114,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_applications_categories_by_usage_info.py b/plugins/modules/organizations_summary_top_applications_categories_by_usage_info.py
index 207456982..0284225dd 100644
--- a/plugins/modules/organizations_summary_top_applications_categories_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_applications_categories_by_usage_info.py
@@ -5,101 +5,104 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_applications_categories_by_usage_info
-short_description: Information module for organizations _summary _top _applications _categories _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _applications _categories _by _usage.
-- Return the top application categories sorted by data usage over given time range. Default unit is megabytes.
-version_added: '2.20.0'
+  - Get all organizations _summary _top _applications _categories _by _usage.
+  - Return the top application categories sorted by data usage over given time range.
+    Default unit is megabytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_applications_categories_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_applications_categories_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/applications/categories/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  networkId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - NetworkId query parameter. Match result to an exact network id.
     type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
-    type: str
-  deviceTag:
-    description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  networkId:
+  organizationId:
     description:
-    - NetworkId query parameter. Match result to an exact network id.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes
-      and be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 25 minutes and be
+        less than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopApplicationsCategoriesByUsage
-  description: Complete reference of the getOrganizationSummaryTopApplicationsCategoriesByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-applications-categories-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_applications_categories_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/applications/categories/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopApplicationsCategoriesByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-applications-categories-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopApplicationsCategoriesByUsage
+short_description: Information module for organizations _summary _top _applications
+  _categories _by _usage
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _applications _categories _by _usage
   cisco.meraki.organizations_summary_top_applications_categories_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     networkId: string
@@ -111,7 +114,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_clients_by_usage_info.py b/plugins/modules/organizations_summary_top_clients_by_usage_info.py
index d6d4201bd..4e04eaab0 100644
--- a/plugins/modules/organizations_summary_top_clients_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_clients_by_usage_info.py
@@ -5,97 +5,100 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_clients_by_usage_info
-short_description: Information module for organizations _summary _top _clients _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _clients _by _usage.
-- Return metrics for organization's top 10 clients by data usage in mb over given time range.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _clients _by _usage.
+  - Return metrics for organization's top 10 clients by data usage in mb over given
+    time range.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_clients_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_clients_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/clients/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and
-      be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 8 hours and be less
+        than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopClientsByUsage
-  description: Complete reference of the getOrganizationSummaryTopClientsByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-clients-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_clients_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/clients/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopClientsByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-clients-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopClientsByUsage
+short_description: Information module for organizations _summary _top _clients _by
+  _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _clients _by _usage
   cisco.meraki.organizations_summary_top_clients_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -106,7 +109,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_clients_manufacturers_by_usage_info.py b/plugins/modules/organizations_summary_top_clients_manufacturers_by_usage_info.py
index 5288f6867..40e13d33e 100644
--- a/plugins/modules/organizations_summary_top_clients_manufacturers_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_clients_manufacturers_by_usage_info.py
@@ -5,97 +5,100 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_clients_manufacturers_by_usage_info
-short_description: Information module for organizations _summary _top _clients _manufacturers _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _clients _manufacturers _by _usage.
-- Return metrics for organization's top clients by data usage in mb over given time range, grouped by manufacturer.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _clients _manufacturers _by _usage.
+  - Return metrics for organization's top clients by data usage in mb over given time
+    range, grouped by manufacturer.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_clients_manufacturers_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_clients_manufacturers_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/clients/manufacturers/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 186 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 186 days. The default
+        is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopClientsManufacturersByUsage
-  description: Complete reference of the getOrganizationSummaryTopClientsManufacturersByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-clients-manufacturers-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_clients_manufacturers_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/clients/manufacturers/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopClientsManufacturersByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-clients-manufacturers-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopClientsManufacturersByUsage
+short_description: Information module for organizations _summary _top _clients _manufacturers
+  _by _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _clients _manufacturers _by _usage
   cisco.meraki.organizations_summary_top_clients_manufacturers_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -106,7 +109,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_devices_by_usage_info.py b/plugins/modules/organizations_summary_top_devices_by_usage_info.py
index 98a4a6556..f2f575ad5 100644
--- a/plugins/modules/organizations_summary_top_devices_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_devices_by_usage_info.py
@@ -5,99 +5,102 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_devices_by_usage_info
-short_description: Information module for organizations _summary _top _devices _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _devices _by _usage.
-- >
-   Return metrics for organization's top 10 devices sorted by data usage over given time range. Default unit is
-   megabytes.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _devices _by _usage.
+  - 'Return metrics for organization''s top 10 devices sorted by data usage over given
+    time range. Default unit is megabytes.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_devices_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_devices_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/devices/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and
-      be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 8 hours and be less
+        than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopDevicesByUsage
-  description: Complete reference of the getOrganizationSummaryTopDevicesByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-devices-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_devices_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/devices/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopDevicesByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-devices-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopDevicesByUsage
+short_description: Information module for organizations _summary _top _devices _by
+  _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _devices _by _usage
   cisco.meraki.organizations_summary_top_devices_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -108,7 +111,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_devices_models_by_usage_info.py b/plugins/modules/organizations_summary_top_devices_models_by_usage_info.py
index 32bc3c830..ed29d50c1 100644
--- a/plugins/modules/organizations_summary_top_devices_models_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_devices_models_by_usage_info.py
@@ -5,99 +5,102 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_devices_models_by_usage_info
-short_description: Information module for organizations _summary _top _devices _models _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _devices _models _by _usage.
-- >
-   Return metrics for organization's top 10 device models sorted by data usage over given time range. Default unit is
-   megabytes.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _devices _models _by _usage.
+  - 'Return metrics for organization''s top 10 device models sorted by data usage
+    over given time range. Default unit is megabytes.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_devices_models_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_devices_models_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/devices/models/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and
-      be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 8 hours and be less
+        than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopDevicesModelsByUsage
-  description: Complete reference of the getOrganizationSummaryTopDevicesModelsByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-devices-models-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_devices_models_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/devices/models/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopDevicesModelsByUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-devices-models-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopDevicesModelsByUsage
+short_description: Information module for organizations _summary _top _devices _models
+  _by _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _devices _models _by _usage
   cisco.meraki.organizations_summary_top_devices_models_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -108,7 +111,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_networks_by_status_info.py b/plugins/modules/organizations_summary_top_networks_by_status_info.py
index 7754916cc..0be1d8b52 100644
--- a/plugins/modules/organizations_summary_top_networks_by_status_info.py
+++ b/plugins/modules/organizations_summary_top_networks_by_status_info.py
@@ -5,103 +5,110 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_networks_by_status_info
-short_description: Information module for organizations _summary _top _networks _by _status
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _networks _by _status.
-- >
-   List the client and status overview information for the networks in an organization. Usage is measured in
-   kilobytes and from the last seven days.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _networks _by _status.
+  - 'List the client and status overview information for the networks in an organization.
+    Usage is measured in kilobytes and from the last seven days.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_networks_by_status_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_networks_by_status,
+  - Paths used are get /organizations/{organizationId}/summary/top/networks/byStatus,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 5000.
+    type: int
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 5000.
-    type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  endingBefore:
+  usageUplink:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - UsageUplink query parameter. Filter results by usage uplink.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopNetworksByStatus
-  description: Complete reference of the getOrganizationSummaryTopNetworksByStatus API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-networks-by-status
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_networks_by_status,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/networks/byStatus,
+  - description: Complete reference of the getOrganizationSummaryTopNetworksByStatus
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-networks-by-status
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopNetworksByStatus
+short_description: Information module for organizations _summary _top _networks _by
+  _status
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _networks _by _status
   cisco.meraki.organizations_summary_top_networks_by_status_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -114,7 +121,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_ssids_by_usage_info.py b/plugins/modules/organizations_summary_top_ssids_by_usage_info.py
index eb03d6a38..fbd7db109 100644
--- a/plugins/modules/organizations_summary_top_ssids_by_usage_info.py
+++ b/plugins/modules/organizations_summary_top_ssids_by_usage_info.py
@@ -5,97 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_ssids_by_usage_info
-short_description: Information module for organizations _summary _top _ssids _by _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _ssids _by _usage.
-- Return metrics for organization's top 10 ssids by data usage over given time range. Default unit is megabytes.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _ssids _by _usage.
+  - Return metrics for organization's top 10 ssids by data usage over given time range.
+    Default unit is megabytes.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_ssids_by_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_ssids_by_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/ssids/byUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and
-      be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 8 hours and be less
+        than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopSsidsByUsage
-  description: Complete reference of the getOrganizationSummaryTopSsidsByUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-ssids-by-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_ssids_by_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/ssids/byUsage,
+  - description: Complete reference of the getOrganizationSummaryTopSsidsByUsage API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-ssids-by-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopSsidsByUsage
+short_description: Information module for organizations _summary _top _ssids _by _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _ssids _by _usage
   cisco.meraki.organizations_summary_top_ssids_by_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -106,7 +107,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_summary_top_switches_by_energy_usage_info.py b/plugins/modules/organizations_summary_top_switches_by_energy_usage_info.py
index 87e48edc9..bb379e85e 100644
--- a/plugins/modules/organizations_summary_top_switches_by_energy_usage_info.py
+++ b/plugins/modules/organizations_summary_top_switches_by_energy_usage_info.py
@@ -5,97 +5,100 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_summary_top_switches_by_energy_usage_info
-short_description: Information module for organizations _summary _top _switches _by _energy _usage
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _summary _top _switches _by _energy _usage.
-- Return metrics for organization's top 10 switches by energy usage over given time range. Default unit is joules.
-version_added: '2.16.0'
+  - Get all organizations _summary _top _switches _by _energy _usage.
+  - Return metrics for organization's top 10 switches by energy usage over given time
+    range. Default unit is joules.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_summary_top_switches_by_energy_usage_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_summary_top_switches_by_energy_usage,
+  - Paths used are get /organizations/{organizationId}/summary/top/switches/byEnergyUsage,
 options:
+  deviceTag:
+    description:
+      - DeviceTag query parameter. Match result to an exact device tag.
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkTag:
     description:
-    - NetworkTag query parameter. Match result to an exact network tag.
+      - NetworkTag query parameter. Match result to an exact network tag.
     type: str
-  deviceTag:
+  organizationId:
     description:
-    - DeviceTag query parameter. Match result to an exact device tag.
+      - OrganizationId path parameter. Organization ID.
     type: str
   quantity:
     description:
-    - Quantity query parameter. Set number of desired results to return. Default is 10.
+      - Quantity query parameter. Set number of desired results to return. Default
+        is 10.
     type: int
   ssidName:
     description:
-    - SsidName query parameter. Filter results by ssid name.
-    type: str
-  usageUplink:
-    description:
-    - UsageUplink query parameter. Filter results by usage uplink.
+      - SsidName query parameter. Filter results by ssid name.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes
-      and be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 25 minutes and be
+        less than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
+  usageUplink:
+    description:
+      - UsageUplink query parameter. Filter results by usage uplink.
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationSummaryTopSwitchesByEnergyUsage
-  description: Complete reference of the getOrganizationSummaryTopSwitchesByEnergyUsage API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-switches-by-energy-usage
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_summary_top_switches_by_energy_usage,
-
-  - Paths used are
-    get /organizations/{organizationId}/summary/top/switches/byEnergyUsage,
+  - description: Complete reference of the getOrganizationSummaryTopSwitchesByEnergyUsage
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-summary-top-switches-by-energy-usage
+    name: Cisco Meraki documentation for organizations getOrganizationSummaryTopSwitchesByEnergyUsage
+short_description: Information module for organizations _summary _top _switches _by
+  _energy _usage
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _summary _top _switches _by _energy _usage
   cisco.meraki.organizations_summary_top_switches_by_energy_usage_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkTag: string
     deviceTag: string
     quantity: 0
@@ -106,7 +109,6 @@
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_devices_clone.py b/plugins/modules/organizations_switch_devices_clone.py
index aa41542af..0678f7c18 100644
--- a/plugins/modules/organizations_switch_devices_clone.py
+++ b/plugins/modules/organizations_switch_devices_clone.py
@@ -5,19 +5,20 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_devices_clone
-short_description: Resource module for organizations _switch _devices _clone
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _switch _devices _clone.
-- >
-   Clone port-level and some switch-level configuration settings from a source switch to one or more target switches.
-   Cloned settings include Aggregation Groups, Power Settings, Multicast Settings, MTU Configuration, STP Bridge
-   priority, Port Mirroring.
-version_added: '2.16.0'
+  - Manage operation create of the resource organizations _switch _devices _clone.
+  - 'Clone port-level and some switch-level configuration settings from a source switch
+    to one or more target switches. Cloned settings include Aggregation Groups, Power
+    Settings, Multicast Settings, MTU Configuration, STP Bridge priority, Port Mirroring.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_devices_clone
+notes:
+  - SDK Method used are switch.Switch.clone_organization_switch_devices,
+  - Paths used are post /organizations/{organizationId}/switch/devices/clone,
 options:
   organizationId:
     description: OrganizationId path parameter. Organization ID.
@@ -32,50 +33,45 @@
     elements: str
     type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch cloneOrganizationSwitchDevices
-  description: Complete reference of the cloneOrganizationSwitchDevices API.
-  link: https://developer.cisco.com/meraki/api-v1/#!clone-organization-switch-devices
-notes:
-  - SDK Method used are
-    switch.Switch.clone_organization_switch_devices,
-
-  - Paths used are
-    post /organizations/{organizationId}/switch/devices/clone,
+  - description: Complete reference of the cloneOrganizationSwitchDevices API.
+    link: https://developer.cisco.com/meraki/api-v1/#!clone-organization-switch-devices
+    name: Cisco Meraki documentation for switch cloneOrganizationSwitchDevices
+short_description: Resource module for organizations _switch _devices _clone
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_switch_devices_clone:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     sourceSerial: Q234-ABCD-5678
     targetSerials:
-    - Q234-ABCD-0001
-    - Q234-ABCD-0002
-    - Q234-ABCD-0003
-
+      - Q234-ABCD-0001
+      - Q234-ABCD-0002
+      - Q234-ABCD-0003
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_ports_by_switch_info.py b/plugins/modules/organizations_switch_ports_by_switch_info.py
index f7266db4e..985294585 100644
--- a/plugins/modules/organizations_switch_ports_by_switch_info.py
+++ b/plugins/modules/organizations_switch_ports_by_switch_info.py
@@ -5,127 +5,138 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_ports_by_switch_info
-short_description: Information module for organizations _switch _ports _by _switch
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _switch _ports _by _switch.
-- List the switchports in an organization by switch.
-version_added: '2.16.0'
+  - Get all organizations _switch _ports _by _switch.
+  - List the switchports in an organization by switch.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_ports_by_switch_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_switch_ports_by_switch,
+  - Paths used are get /organizations/{organizationId}/switch/ports/bySwitch,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 50. Default is 50.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Optional parameter to filter items
+        to switches where the configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  configurationUpdatedAfter:
-    description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Optional parameter to filter items to switches where the
-      configuration has been updated after the given timestamp.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   mac:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter items to switches with MAC addresses that contain the
-      search term or are an exact match.
+      - 'Mac query parameter. Optional parameter to filter items to switches with
+        MAC addresses that contain the search term or are an exact match.
+
+        '
     type: str
   macs:
     description:
-    - Macs query parameter. Optional parameter to filter items to switches that have one of the provided MAC addresses.
+      - Macs query parameter. Optional parameter to filter items to switches that
+        have one of the provided MAC addresses.
     elements: str
     type: list
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter items to switches with names that contain the search term
-      or are an exact match.
+      - 'Name query parameter. Optional parameter to filter items to switches with
+        names that contain the search term or are an exact match.
+
+        '
     type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter items to switches in one of the provided networks.
+      - NetworkIds query parameter. Optional parameter to filter items to switches
+        in one of the provided networks.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 50. Default is 50.
+    type: int
   portProfileIds:
     description:
-    - >
-      PortProfileIds query parameter. Optional parameter to filter items to switches that contain switchports
-      belonging to one of the specified port profiles.
+      - 'PortProfileIds query parameter. Optional parameter to filter items to switches
+        that contain switchports belonging to one of the specified port profiles.
+
+        '
     elements: str
     type: list
   serial:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter items to switches with serial number that contains the
-      search term or are an exact match.
+      - 'Serial query parameter. Optional parameter to filter items to switches with
+        serial number that contains the search term or are an exact match.
+
+        '
     type: str
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter items to switches that have one of the provided serials.
+      - Serials query parameter. Optional parameter to filter items to switches that
+        have one of the provided serials.
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationSwitchPortsBySwitch
-  description: Complete reference of the getOrganizationSwitchPortsBySwitch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-by-switch
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_switch_ports_by_switch,
-
-  - Paths used are
-    get /organizations/{organizationId}/switch/ports/bySwitch,
+  - description: Complete reference of the getOrganizationSwitchPortsBySwitch API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-by-switch
+    name: Cisco Meraki documentation for switch getOrganizationSwitchPortsBySwitch
+short_description: Information module for organizations _switch _ports _by _switch
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _switch _ports _by _switch
   cisco.meraki.organizations_switch_ports_by_switch_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -141,7 +152,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_ports_clients_overview_by_device_info.py b/plugins/modules/organizations_switch_ports_clients_overview_by_device_info.py
index 1d3285ab1..aaafdc155 100644
--- a/plugins/modules/organizations_switch_ports_clients_overview_by_device_info.py
+++ b/plugins/modules/organizations_switch_ports_clients_overview_by_device_info.py
@@ -5,138 +5,154 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_ports_clients_overview_by_device_info
-short_description: Information module for organizations _switch _ports _clients _overview _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _switch _ports _clients _overview _by _device.
-- List the number of clients for all switchports with at least one online client in an organization.
-version_added: '2.20.0'
+  - Get all organizations _switch _ports _clients _overview _by _device.
+  - List the number of clients for all switchports with at least one online client
+    in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_ports_clients_overview_by_device_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_switch_ports_clients_overview_by_device,
+  - Paths used are get /organizations/{organizationId}/switch/ports/clients/overview/byDevice,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
-    type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 20. Default is 20.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Optional parameter to filter items
+        to switches where the configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  configurationUpdatedAfter:
-    description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Optional parameter to filter items to switches where the
-      configuration has been updated after the given timestamp.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   mac:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter items to switches with MAC addresses that contain the
-      search term or are an exact match.
+      - 'Mac query parameter. Optional parameter to filter items to switches with
+        MAC addresses that contain the search term or are an exact match.
+
+        '
     type: str
   macs:
     description:
-    - Macs query parameter. Optional parameter to filter items to switches that have one of the provided MAC addresses.
+      - Macs query parameter. Optional parameter to filter items to switches that
+        have one of the provided MAC addresses.
     elements: str
     type: list
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter items to switches with names that contain the search term
-      or are an exact match.
+      - 'Name query parameter. Optional parameter to filter items to switches with
+        names that contain the search term or are an exact match.
+
+        '
     type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter items to switches in one of the provided networks.
+      - NetworkIds query parameter. Optional parameter to filter items to switches
+        in one of the provided networks.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 20. Default is 20.
+    type: int
   portProfileIds:
     description:
-    - >
-      PortProfileIds query parameter. Optional parameter to filter items to switches that contain switchports
-      belonging to one of the specified port profiles.
+      - 'PortProfileIds query parameter. Optional parameter to filter items to switches
+        that contain switchports belonging to one of the specified port profiles.
+
+        '
     elements: str
     type: list
   serial:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter items to switches with serial number that contains the
-      search term or are an exact match.
+      - 'Serial query parameter. Optional parameter to filter items to switches with
+        serial number that contains the search term or are an exact match.
+
+        '
     type: str
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter items to switches that have one of the provided serials.
+      - Serials query parameter. Optional parameter to filter items to switches that
+        have one of the provided serials.
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationSwitchPortsClientsOverviewByDevice
-  description: Complete reference of the getOrganizationSwitchPortsClientsOverviewByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-clients-overview-by-device
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_switch_ports_clients_overview_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/switch/ports/clients/overview/byDevice,
+  - description: Complete reference of the getOrganizationSwitchPortsClientsOverviewByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-clients-overview-by-device
+    name: Cisco Meraki documentation for switch getOrganizationSwitchPortsClientsOverviewByDevice
+short_description: Information module for organizations _switch _ports _clients _overview
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _switch _ports _clients _overview _by _device
   cisco.meraki.organizations_switch_ports_clients_overview_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     timespan: 0
     perPage: 0
@@ -154,7 +170,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_ports_overview_info.py b/plugins/modules/organizations_switch_ports_overview_info.py
index c2b841159..18d5f1360 100644
--- a/plugins/modules/organizations_switch_ports_overview_info.py
+++ b/plugins/modules/organizations_switch_ports_overview_info.py
@@ -5,89 +5,90 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_ports_overview_info
-short_description: Information module for organizations _switch _ports _overview
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _switch _ports _overview.
-- >
-   Returns the counts of all active ports for the requested timespan, grouped by speed. An active port is a port that
-   at any point during the timeframe is observed to be connected to a responsive device and isn't configured to be
-   disabled. For a port that is observed at multiple speeds during the timeframe, it will be counted at the highest
-   speed observed. The number of inactive ports, and the total number of ports are also provided. Only ports on
-   switches online during the timeframe will be represented and a port is only guaranteed to be present if its switch
-   was online for at least 6 hours of the timeframe.
-version_added: '2.20.0'
+  - Get all organizations _switch _ports _overview.
+  - 'Returns the counts of all active ports for the requested timespan, grouped by
+    speed. An active port is a port that at any point during the timeframe is observed
+    to be connected to a responsive device and isn''t configured to be disabled. For
+    a port that is observed at multiple speeds during the timeframe, it will be counted
+    at the highest speed observed. The number of inactive ports, and the total number
+    of ports are also provided. Only ports on switches online during the timeframe
+    will be represented and a port is only guaranteed to be present if its switch
+    was online for at least 6 hours of the timeframe.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_ports_overview_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_switch_ports_overview,
+  - Paths used are get /organizations/{organizationId}/switch/ports/overview,
 options:
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data.
+      - T0 query parameter. The beginning of the timespan for the data.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 186 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 186 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 12 hours and
-      be less than or equal to 186 days. The default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 12 hours and be less
+        than or equal to 186 days. The default is 1 day.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationSwitchPortsOverview
-  description: Complete reference of the getOrganizationSwitchPortsOverview API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-overview
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_switch_ports_overview,
-
-  - Paths used are
-    get /organizations/{organizationId}/switch/ports/overview,
+  - description: Complete reference of the getOrganizationSwitchPortsOverview API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-overview
+    name: Cisco Meraki documentation for switch getOrganizationSwitchPortsOverview
+short_description: Information module for organizations _switch _ports _overview
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _switch _ports _overview
   cisco.meraki.organizations_switch_ports_overview_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
     organizationId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_ports_statuses_by_switch_info.py b/plugins/modules/organizations_switch_ports_statuses_by_switch_info.py
index def2335ba..10c816756 100644
--- a/plugins/modules/organizations_switch_ports_statuses_by_switch_info.py
+++ b/plugins/modules/organizations_switch_ports_statuses_by_switch_info.py
@@ -5,127 +5,140 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_ports_statuses_by_switch_info
-short_description: Information module for organizations _switch _ports _statuses _by _switch
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _switch _ports _statuses _by _switch.
-- List the switchports in an organization.
-version_added: '2.20.0'
+  - Get all organizations _switch _ports _statuses _by _switch.
+  - List the switchports in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_ports_statuses_by_switch_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_switch_ports_statuses_by_switch,
+  - Paths used are get /organizations/{organizationId}/switch/ports/statuses/bySwitch,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 20. Default is 10.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Optional parameter to filter items
+        to switches where the configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  configurationUpdatedAfter:
-    description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Optional parameter to filter items to switches where the
-      configuration has been updated after the given timestamp.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   mac:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter items to switches with MAC addresses that contain the
-      search term or are an exact match.
+      - 'Mac query parameter. Optional parameter to filter items to switches with
+        MAC addresses that contain the search term or are an exact match.
+
+        '
     type: str
   macs:
     description:
-    - Macs query parameter. Optional parameter to filter items to switches that have one of the provided MAC addresses.
+      - Macs query parameter. Optional parameter to filter items to switches that
+        have one of the provided MAC addresses.
     elements: str
     type: list
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter items to switches with names that contain the search term
-      or are an exact match.
+      - 'Name query parameter. Optional parameter to filter items to switches with
+        names that contain the search term or are an exact match.
+
+        '
     type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter items to switches in one of the provided networks.
+      - NetworkIds query parameter. Optional parameter to filter items to switches
+        in one of the provided networks.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 20. Default is 10.
+    type: int
   portProfileIds:
     description:
-    - >
-      PortProfileIds query parameter. Optional parameter to filter items to switches that contain switchports
-      belonging to one of the specified port profiles.
+      - 'PortProfileIds query parameter. Optional parameter to filter items to switches
+        that contain switchports belonging to one of the specified port profiles.
+
+        '
     elements: str
     type: list
   serial:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter items to switches with serial number that contains the
-      search term or are an exact match.
+      - 'Serial query parameter. Optional parameter to filter items to switches with
+        serial number that contains the search term or are an exact match.
+
+        '
     type: str
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter items to switches that have one of the provided serials.
+      - Serials query parameter. Optional parameter to filter items to switches that
+        have one of the provided serials.
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationSwitchPortsStatusesBySwitch
-  description: Complete reference of the getOrganizationSwitchPortsStatusesBySwitch API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-statuses-by-switch
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_switch_ports_statuses_by_switch,
-
-  - Paths used are
-    get /organizations/{organizationId}/switch/ports/statuses/bySwitch,
+  - description: Complete reference of the getOrganizationSwitchPortsStatusesBySwitch
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-statuses-by-switch
+    name: Cisco Meraki documentation for switch getOrganizationSwitchPortsStatusesBySwitch
+short_description: Information module for organizations _switch _ports _statuses _by
+  _switch
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _switch _ports _statuses _by _switch
   cisco.meraki.organizations_switch_ports_statuses_by_switch_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -141,7 +154,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_switch_ports_topology_discovery_by_device_info.py b/plugins/modules/organizations_switch_ports_topology_discovery_by_device_info.py
index fd8e8f049..37cc3cbe0 100644
--- a/plugins/modules/organizations_switch_ports_topology_discovery_by_device_info.py
+++ b/plugins/modules/organizations_switch_ports_topology_discovery_by_device_info.py
@@ -5,138 +5,154 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_switch_ports_topology_discovery_by_device_info
-short_description: Information module for organizations _switch _ports _topology _discovery _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _switch _ports _topology _discovery _by _device.
-- List most recently seen LLDP/CDP discovery and topology information per switch port in an organization.
-version_added: '2.20.0'
+  - Get all organizations _switch _ports _topology _discovery _by _device.
+  - List most recently seen LLDP/CDP discovery and topology information per switch
+    port in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_switch_ports_topology_discovery_by_device_info
+notes:
+  - SDK Method used are switch.Switch.get_organization_switch_ports_topology_discovery_by_device,
+  - Paths used are get /organizations/{organizationId}/switch/ports/topology/discovery/byDevice,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  t0:
-    description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
-    type: str
-  timespan:
-    description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameter t0. The value must be in seconds and be less than or equal to 31 days. The default is
-      1 day.
-    type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 20. Default is 10.
-    type: int
-  startingAfter:
+  configurationUpdatedAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'ConfigurationUpdatedAfter query parameter. Optional parameter to filter items
+        to switches where the configuration has been updated after the given timestamp.
+
+        '
     type: str
   endingBefore:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  configurationUpdatedAfter:
-    description:
-    - >
-      ConfigurationUpdatedAfter query parameter. Optional parameter to filter items to switches where the
-      configuration has been updated after the given timestamp.
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
+  headers:
+    description: Additional headers.
+    type: dict
   mac:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter items to switches with MAC addresses that contain the
-      search term or are an exact match.
+      - 'Mac query parameter. Optional parameter to filter items to switches with
+        MAC addresses that contain the search term or are an exact match.
+
+        '
     type: str
   macs:
     description:
-    - Macs query parameter. Optional parameter to filter items to switches that have one of the provided MAC addresses.
+      - Macs query parameter. Optional parameter to filter items to switches that
+        have one of the provided MAC addresses.
     elements: str
     type: list
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter items to switches with names that contain the search term
-      or are an exact match.
+      - 'Name query parameter. Optional parameter to filter items to switches with
+        names that contain the search term or are an exact match.
+
+        '
     type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter items to switches in one of the provided networks.
+      - NetworkIds query parameter. Optional parameter to filter items to switches
+        in one of the provided networks.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 20. Default is 10.
+    type: int
   portProfileIds:
     description:
-    - >
-      PortProfileIds query parameter. Optional parameter to filter items to switches that contain switchports
-      belonging to one of the specified port profiles.
+      - 'PortProfileIds query parameter. Optional parameter to filter items to switches
+        that contain switchports belonging to one of the specified port profiles.
+
+        '
     elements: str
     type: list
   serial:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter items to switches with serial number that contains the
-      search term or are an exact match.
+      - 'Serial query parameter. Optional parameter to filter items to switches with
+        serial number that contains the search term or are an exact match.
+
+        '
     type: str
   serials:
     description:
-    - Serials query parameter. Optional parameter to filter items to switches that have one of the provided serials.
+      - Serials query parameter. Optional parameter to filter items to switches that
+        have one of the provided serials.
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  t0:
+    description:
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
+    type: str
+  timespan:
+    description:
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameter t0. The value must
+        be in seconds and be less than or equal to 31 days. The default is 1 day.
+
+        '
+    type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for switch getOrganizationSwitchPortsTopologyDiscoveryByDevice
-  description: Complete reference of the getOrganizationSwitchPortsTopologyDiscoveryByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-topology-discovery-by-device
-notes:
-  - SDK Method used are
-    switch.Switch.get_organization_switch_ports_topology_discovery_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/switch/ports/topology/discovery/byDevice,
+  - description: Complete reference of the getOrganizationSwitchPortsTopologyDiscoveryByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-topology-discovery-by-device
+    name: Cisco Meraki documentation for switch getOrganizationSwitchPortsTopologyDiscoveryByDevice
+short_description: Information module for organizations _switch _ports _topology _discovery
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _switch _ports _topology _discovery _by _device
   cisco.meraki.organizations_switch_ports_topology_discovery_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     timespan: 0
     perPage: 0
@@ -154,7 +170,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_uplinks_statuses_info.py b/plugins/modules/organizations_uplinks_statuses_info.py
index 76b8f10f1..6bc55d6b5 100644
--- a/plugins/modules/organizations_uplinks_statuses_info.py
+++ b/plugins/modules/organizations_uplinks_statuses_info.py
@@ -5,100 +5,106 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_uplinks_statuses_info
-short_description: Information module for organizations _uplinks _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _uplinks _statuses.
-- List the uplink status of every Meraki MX, MG and Z series devices in the organization.
-version_added: '2.16.0'
+  - Get all organizations _uplinks _statuses.
+  - List the uplink status of every Meraki MX, MG and Z series devices in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_uplinks_statuses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_uplinks_statuses,
+  - Paths used are get /organizations/{organizationId}/uplinks/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  iccids:
+    description:
+      - Iccids query parameter. A list of ICCIDs. The returned devices will be filtered
+        to only include these ICCIDs.
+    elements: str
+    type: list
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. A list of network IDs. The returned devices will
+        be filtered to only include these networks.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. A list of network IDs. The returned devices will be filtered to only include
-      these networks.
-    elements: str
-    type: list
   serials:
     description:
-    - >
-      Serials query parameter. A list of serial numbers. The returned devices will be filtered to only include
-      these serials.
+      - 'Serials query parameter. A list of serial numbers. The returned devices will
+        be filtered to only include these serials.
+
+        '
     elements: str
     type: list
-  iccids:
+  startingAfter:
     description:
-    - Iccids query parameter. A list of ICCIDs. The returned devices will be filtered to only include these ICCIDs.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationUplinksStatuses
-  description: Complete reference of the getOrganizationUplinksStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-uplinks-statuses
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_uplinks_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/uplinks/statuses,
+  - description: Complete reference of the getOrganizationUplinksStatuses API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-uplinks-statuses
+    name: Cisco Meraki documentation for organizations getOrganizationUplinksStatuses
+short_description: Information module for organizations _uplinks _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _uplinks _statuses
   cisco.meraki.organizations_uplinks_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -109,7 +115,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_webhooks_callbacks_statuses_info.py b/plugins/modules/organizations_webhooks_callbacks_statuses_info.py
index 5dacc6dc1..88be17f88 100644
--- a/plugins/modules/organizations_webhooks_callbacks_statuses_info.py
+++ b/plugins/modules/organizations_webhooks_callbacks_statuses_info.py
@@ -5,70 +5,66 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_webhooks_callbacks_statuses_info
-short_description: Information module for organizations _webhooks _callbacks _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get organizations _webhooks _callbacks _statuses by id.
-- Return the status of an API callback.
-version_added: '2.16.0'
+  - Get organizations _webhooks _callbacks _statuses by id.
+  - Return the status of an API callback.
 extends_documentation_fragment:
   - cisco.meraki.module_info
-author: Francisco Munoz (@fmunoz)
+module: organizations_webhooks_callbacks_statuses_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_webhooks_callbacks_status,
+  - Paths used are get /organizations/{organizationId}/webhooks/callbacks/statuses/{callbackId},
 options:
+  callbackId:
+    description:
+      - CallbackId path parameter. Callback ID.
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  callbackId:
-    description:
-    - CallbackId path parameter. Callback ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationWebhooksCallbacksStatus
-  description: Complete reference of the getOrganizationWebhooksCallbacksStatus API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-webhooks-callbacks-status
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_webhooks_callbacks_status,
-
-  - Paths used are
-    get /organizations/{organizationId}/webhooks/callbacks/statuses/{callbackId},
+  - description: Complete reference of the getOrganizationWebhooksCallbacksStatus
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-webhooks-callbacks-status
+    name: Cisco Meraki documentation for organizations getOrganizationWebhooksCallbacksStatus
+short_description: Information module for organizations _webhooks _callbacks _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get organizations _webhooks _callbacks _statuses by id
   cisco.meraki.organizations_webhooks_callbacks_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     organizationId: string
     callbackId: string
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_webhooks_logs_info.py b/plugins/modules/organizations_webhooks_logs_info.py
index 7bd8e07eb..4236091af 100644
--- a/plugins/modules/organizations_webhooks_logs_info.py
+++ b/plugins/modules/organizations_webhooks_logs_info.py
@@ -5,100 +5,107 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_webhooks_logs_info
-short_description: Information module for organizations _webhooks _logs
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _webhooks _logs.
-- Return the log of webhook POSTs sent.
-version_added: '2.16.0'
+  - Get all organizations _webhooks _logs.
+  - Return the log of webhook POSTs sent.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_webhooks_logs_info
+notes:
+  - SDK Method used are organizations.Organizations.get_organization_webhooks_logs,
+  - Paths used are get /organizations/{organizationId}/webhooks/logs,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 50.
+    type: int
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 1 day.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 1 day.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
   url:
     description:
-    - Url query parameter. The URL the webhook was sent to.
+      - Url query parameter. The URL the webhook was sent to.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for organizations getOrganizationWebhooksLogs
-  description: Complete reference of the getOrganizationWebhooksLogs API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-webhooks-logs
-notes:
-  - SDK Method used are
-    organizations.Organizations.get_organization_webhooks_logs,
-
-  - Paths used are
-    get /organizations/{organizationId}/webhooks/logs,
+  - description: Complete reference of the getOrganizationWebhooksLogs API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-webhooks-logs
+    name: Cisco Meraki documentation for organizations getOrganizationWebhooksLogs
+short_description: Information module for organizations _webhooks _logs
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _webhooks _logs
   cisco.meraki.organizations_webhooks_logs_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     t0: string
     t1: string
     timespan: 0
@@ -110,7 +117,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_air_marshal_rules_info.py b/plugins/modules/organizations_wireless_air_marshal_rules_info.py
index f36194076..b71cf7f59 100644
--- a/plugins/modules/organizations_wireless_air_marshal_rules_info.py
+++ b/plugins/modules/organizations_wireless_air_marshal_rules_info.py
@@ -5,86 +5,90 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_air_marshal_rules_info
-short_description: Information module for organizations _wireless _air _marshal _rules
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _air _marshal _rules.
-- Returns the current Air Marshal rules for this organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _air _marshal _rules.
+  - Returns the current Air Marshal rules for this organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_air_marshal_rules_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_air_marshal_rules,
+  - Paths used are get /organizations/{organizationId}/wireless/airMarshal/rules,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - NetworkIds query parameter. (optional) The set of network IDs to include.
+      - NetworkIds query parameter. (optional) The set of network IDs to include.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessAirMarshalRules
-  description: Complete reference of the getOrganizationWirelessAirMarshalRules API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-air-marshal-rules
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_air_marshal_rules,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/airMarshal/rules,
+  - description: Complete reference of the getOrganizationWirelessAirMarshalRules
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-air-marshal-rules
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessAirMarshalRules
+short_description: Information module for organizations _wireless _air _marshal _rules
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _air _marshal _rules
   cisco.meraki.organizations_wireless_air_marshal_rules_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     perPage: 0
     startingAfter: string
@@ -93,7 +97,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_air_marshal_settings_by_network_info.py b/plugins/modules/organizations_wireless_air_marshal_settings_by_network_info.py
index bcd52a552..e7e41c96a 100644
--- a/plugins/modules/organizations_wireless_air_marshal_settings_by_network_info.py
+++ b/plugins/modules/organizations_wireless_air_marshal_settings_by_network_info.py
@@ -5,86 +5,91 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_air_marshal_settings_by_network_info
-short_description: Information module for organizations _wireless _air _marshal _settings _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _air _marshal _settings _by _network.
-- Returns the current Air Marshal settings for this network.
-version_added: '2.20.0'
+  - Get all organizations _wireless _air _marshal _settings _by _network.
+  - Returns the current Air Marshal settings for this network.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_air_marshal_settings_by_network_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_air_marshal_settings_by_network,
+  - Paths used are get /organizations/{organizationId}/wireless/airMarshal/settings/byNetwork,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - NetworkIds query parameter. The network IDs to include in the result set.
+      - NetworkIds query parameter. The network IDs to include in the result set.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessAirMarshalSettingsByNetwork
-  description: Complete reference of the getOrganizationWirelessAirMarshalSettingsByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-air-marshal-settings-by-network
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_air_marshal_settings_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/airMarshal/settings/byNetwork,
+  - description: Complete reference of the getOrganizationWirelessAirMarshalSettingsByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-air-marshal-settings-by-network
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessAirMarshalSettingsByNetwork
+short_description: Information module for organizations _wireless _air _marshal _settings
+  _by _network
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _air _marshal _settings _by _network
   cisco.meraki.organizations_wireless_air_marshal_settings_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     perPage: 0
     startingAfter: string
@@ -93,7 +98,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_clients_overview_by_device_info.py b/plugins/modules/organizations_wireless_clients_overview_by_device_info.py
index 64c4f809a..471319f66 100644
--- a/plugins/modules/organizations_wireless_clients_overview_by_device_info.py
+++ b/plugins/modules/organizations_wireless_clients_overview_by_device_info.py
@@ -5,102 +5,110 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_clients_overview_by_device_info
-short_description: Information module for organizations _wireless _clients _overview _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _clients _overview _by _device.
-- List access point client count at the moment in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _clients _overview _by _device.
+  - List access point client count at the moment in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_clients_overview_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_clients_overview_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/clients/overview/byDevice,
 options:
+  campusGatewayClusterIds:
+    description:
+      - 'CampusGatewayClusterIds query parameter. Optional parameter to filter access
+        points client counts by MCG cluster IDs. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter access points client counts by network ID. This
-      filter uses multiple exact matches.
-    elements: str
-    type: list
-  serials:
-    description:
-    - >
-      Serials query parameter. Optional parameter to filter access points client counts by its serial numbers.
-      This filter uses multiple exact matches.
+      - 'NetworkIds query parameter. Optional parameter to filter access points client
+        counts by network ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  campusGatewayClusterIds:
+  organizationId:
     description:
-    - >
-      CampusGatewayClusterIds query parameter. Optional parameter to filter access points client counts by MCG
-      cluster IDs. This filter uses multiple exact matches.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - 'Serials query parameter. Optional parameter to filter access points client
+        counts by its serial numbers. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessClientsOverviewByDevice
-  description: Complete reference of the getOrganizationWirelessClientsOverviewByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-clients-overview-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_clients_overview_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/clients/overview/byDevice,
+  - description: Complete reference of the getOrganizationWirelessClientsOverviewByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-clients-overview-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessClientsOverviewByDevice
+short_description: Information module for organizations _wireless _clients _overview
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _clients _overview _by _device
   cisco.meraki.organizations_wireless_clients_overview_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     campusGatewayClusterIds: []
@@ -111,7 +119,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_availabilities_change_history_info.py b/plugins/modules/organizations_wireless_controller_availabilities_change_history_info.py
index 94b0bf0eb..36b74cd10 100644
--- a/plugins/modules/organizations_wireless_controller_availabilities_change_history_info.py
+++ b/plugins/modules/organizations_wireless_controller_availabilities_change_history_info.py
@@ -5,105 +5,116 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_availabilities_change_history_info
-short_description: Information module for organizations _wireless _controller _availabilities _change _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _availabilities _change _history.
-- >
-   List connectivity data of wireless LAN controllers in an organization. If it is HA setup, then only returns active
-   WLC data start from switchover.
-version_added: '2.16.0'
+  - Get all organizations _wireless _controller _availabilities _change _history.
+  - 'List connectivity data of wireless LAN controllers in an organization. If it
+    is HA setup, then only returns active WLC data start from switchover.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_availabilities_change_history_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_availabilities_change_history,
+  - Paths used are get /organizations/{organizationId}/wirelessController/availabilities/changeHistory,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerAvailabilitiesChangeHistory
-  description: Complete reference of the getOrganizationWirelessControllerAvailabilitiesChangeHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-availabilities-change-history
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_availabilities_change_history,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/availabilities/changeHistory,
+  - description: Complete reference of the getOrganizationWirelessControllerAvailabilitiesChangeHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-availabilities-change-history
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerAvailabilitiesChangeHistory
+short_description: Information module for organizations _wireless _controller _availabilities
+  _change _history
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _availabilities _change _history
   cisco.meraki.organizations_wireless_controller_availabilities_change_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -115,7 +126,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_clients_overview_history_by_device_by_interval_info.py b/plugins/modules/organizations_wireless_controller_clients_overview_history_by_device_by_interval_info.py
index 12d166fe8..5522f9175 100644
--- a/plugins/modules/organizations_wireless_controller_clients_overview_history_by_device_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_controller_clients_overview_history_by_device_by_interval_info.py
@@ -5,116 +5,131 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_clients_overview_history_by_device_by_interval_info
-short_description: Information module for organizations _wireless _controller _clients _overview _history _by _device _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _clients _overview _history _by _device _by _interval.
-- List wireless client counts of wireless LAN controllers over time in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _clients _overview _history _by _device
+    _by _interval.
+  - List wireless client counts of wireless LAN controllers over time in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_clients_overview_history_by_device_by_interval_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_clients_overview_history_by_device_by_interval,
+  - Paths used are get /organizations/{organizationId}/wirelessController/clients/overview/history/byDevice/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter wireless LAN controllers by network ID. This filter
-      uses multiple exact matches.
+      - 'NetworkIds query parameter. Optional parameter to filter wireless LAN controllers
+        by network ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  resolution:
+    description:
+      - 'Resolution query parameter. The time resolution in seconds for returned data.
+        The valid resolutions are 300, 600, 1200, 3600, 14400, 86400. The default
+        is 86400.
+
+        '
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  resolution:
-    description:
-    - >
-      Resolution query parameter. The time resolution in seconds for returned data. The valid resolutions are 300,
-      600, 1200, 3600, 14400, 86400. The default is 86400.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerClientsOverviewHistoryByDeviceByInterval
-  description: Complete reference of the getOrganizationWirelessControllerClientsOverviewHistoryByDeviceByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-clients-overview-history-by-device-by-interval
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_clients_overview_history_by_device_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/clients/overview/history/byDevice/byInterval,
+  - description: Complete reference of the getOrganizationWirelessControllerClientsOverviewHistoryByDeviceByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-clients-overview-history-by-device-by-interval
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerClientsOverviewHistoryByDeviceByInterval
+short_description: Information module for organizations _wireless _controller _clients
+  _overview _history _by _device _by _interval
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _clients _overview _history _by _device _by _interval
+- name: Get all organizations _wireless _controller _clients _overview _history _by
+    _device _by _interval
   cisco.meraki.organizations_wireless_controller_clients_overview_history_by_device_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     t0: string
@@ -128,7 +143,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_connections_info.py b/plugins/modules/organizations_wireless_controller_connections_info.py
index 68f6a27f1..83f92ad46 100644
--- a/plugins/modules/organizations_wireless_controller_connections_info.py
+++ b/plugins/modules/organizations_wireless_controller_connections_info.py
@@ -5,95 +5,101 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_connections_info
-short_description: Information module for organizations _wireless _controller _connections
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _connections.
-- List all access points associated with wireless LAN controllers in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _connections.
+  - List all access points associated with wireless LAN controllers in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_connections_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_connections,
+  - Paths used are get /organizations/{organizationId}/wirelessController/connections,
 options:
+  controllerSerials:
+    description:
+      - 'ControllerSerials query parameter. Optional parameter to filter access points
+        by its controller cloud ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter access points by network ID. This filter uses
-      multiple exact matches.
+      - 'NetworkIds query parameter. Optional parameter to filter access points by
+        network ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  controllerSerials:
+  organizationId:
     description:
-    - >
-      ControllerSerials query parameter. Optional parameter to filter access points by its controller cloud ID.
-      This filter uses multiple exact matches.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerConnections
-  description: Complete reference of the getOrganizationWirelessControllerConnections API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-connections
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_connections,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/connections,
+  - description: Complete reference of the getOrganizationWirelessControllerConnections
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-connections
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerConnections
+short_description: Information module for organizations _wireless _controller _connections
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _connections
   cisco.meraki.organizations_wireless_controller_connections_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     controllerSerials: []
     perPage: 0
@@ -103,7 +109,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_by_device_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_by_device_info.py
index 03b74c85b..fabaa5427 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_by_device_info.py
@@ -5,103 +5,113 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l2_by_device_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l2 _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l2 _by _device.
-- List wireless LAN controller layer 2 interfaces in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l2 _by _device.
+  - List wireless LAN controller layer 2 interfaces in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l2_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2ByDevice
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2ByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2ByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2ByDevice
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l2 _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _devices _interfaces l2 _by _device
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l2_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +123,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info.py
index d6cecea5b..58d0d6f1d 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info.py
@@ -5,112 +5,125 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l2 _statuses _change _history _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l2 _statuses _change _history _by _device.
-- List wireless LAN controller layer 2 interfaces history status in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l2 _statuses
+    _change _history _by _device.
+  - List wireless LAN controller layer 2 interfaces history status in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/statuses/changeHistory/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  includeInterfacesWithoutChanges:
+    description:
+      - 'IncludeInterfacesWithoutChanges query parameter. By default, interfaces without
+        changes are omitted from the response for brevity. If you want to include
+        the interfaces even if they have no changes, set to true. (default false).
+
+        '
+    type: bool
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  includeInterfacesWithoutChanges:
+  startingAfter:
     description:
-    - >
-      IncludeInterfacesWithoutChanges query parameter. By default, interfaces without changes are omitted from the
-      response for brevity. If you want to include the interfaces even if they have no changes, set to true.
-      (default false).
-    type: bool
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2StatusesChangeHistoryByDevice
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2StatusesChangeHistoryByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-statuses-change-history-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/statuses/changeHistory/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2StatusesChangeHistoryByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-statuses-change-history-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2StatusesChangeHistoryByDevice
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l2 _statuses _change _history _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces l2 _statuses _change _history _by _device
+- name: Get all organizations _wireless _controller _devices _interfaces l2 _statuses
+    _change _history _by _device
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l2_statuses_change_history_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
-    includeInterfacesWithoutChanges: True
+    includeInterfacesWithoutChanges: true
     t0: string
     t1: string
     timespan: 0
@@ -121,7 +134,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info.py
index c32e8552b..979e7fd9c 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info.py
@@ -5,103 +5,115 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l2 _usage _history _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l2 _usage _history _by _interval.
-- List wireless LAN controller layer 2 interfaces history usage in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l2 _usage _history
+    _by _interval.
+  - List wireless LAN controller layer 2 interfaces history usage in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_usage_history_by_interval,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/usage/history/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2UsageHistoryByInterval
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2UsageHistoryByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-usage-history-by-interval
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l2_usage_history_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l2/usage/history/byInterval,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL2UsageHistoryByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l2-usage-history-by-interval
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL2UsageHistoryByInterval
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l2 _usage _history _by _interval
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces l2 _usage _history _by _interval
+- name: Get all organizations _wireless _controller _devices _interfaces l2 _usage
+    _history _by _interval
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l2_usage_history_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +125,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_by_device_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_by_device_info.py
index e17c051fd..202960767 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_by_device_info.py
@@ -5,103 +5,113 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l3_by_device_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l3 _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l3 _by _device.
-- List wireless LAN controller layer 3 interfaces in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l3 _by _device.
+  - List wireless LAN controller layer 3 interfaces in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l3_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3ByDevice
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3ByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3ByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3ByDevice
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l3 _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _devices _interfaces l3 _by _device
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l3_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +123,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info.py
index 35b49ab8d..49e824b2f 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info.py
@@ -5,112 +5,125 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l3 _statuses _change _history _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l3 _statuses _change _history _by _device.
-- List wireless LAN controller layer 3 interfaces history status in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l3 _statuses
+    _change _history _by _device.
+  - List wireless LAN controller layer 3 interfaces history status in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/statuses/changeHistory/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  includeInterfacesWithoutChanges:
+    description:
+      - 'IncludeInterfacesWithoutChanges query parameter. By default, interfaces without
+        changes are omitted from the response for brevity. If you want to include
+        the interfaces even if they have no changes, set to true. (default false).
+
+        '
+    type: bool
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  includeInterfacesWithoutChanges:
+  startingAfter:
     description:
-    - >
-      IncludeInterfacesWithoutChanges query parameter. By default, interfaces without changes are omitted from the
-      response for brevity. If you want to include the interfaces even if they have no changes, set to true.
-      (default false).
-    type: bool
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3StatusesChangeHistoryByDevice
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3StatusesChangeHistoryByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-statuses-change-history-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/statuses/changeHistory/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3StatusesChangeHistoryByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-statuses-change-history-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3StatusesChangeHistoryByDevice
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l3 _statuses _change _history _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces l3 _statuses _change _history _by _device
+- name: Get all organizations _wireless _controller _devices _interfaces l3 _statuses
+    _change _history _by _device
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l3_statuses_change_history_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
-    includeInterfacesWithoutChanges: True
+    includeInterfacesWithoutChanges: true
     t0: string
     t1: string
     timespan: 0
@@ -121,7 +134,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info.py
index 56a33b5f8..6f9e7f3a5 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info.py
@@ -5,103 +5,115 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces l3 _usage _history _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces l3 _usage _history _by _interval.
-- List wireless LAN controller layer 3 interfaces history usage in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces l3 _usage _history
+    _by _interval.
+  - List wireless LAN controller layer 3 interfaces history usage in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_usage_history_by_interval,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/usage/history/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3UsageHistoryByInterval
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3UsageHistoryByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-usage-history-by-interval
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_l3_usage_history_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/l3/usage/history/byInterval,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesL3UsageHistoryByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-l3-usage-history-by-interval
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesL3UsageHistoryByInterval
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces l3 _usage _history _by _interval
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces l3 _usage _history _by _interval
+- name: Get all organizations _wireless _controller _devices _interfaces l3 _usage
+    _history _by _interval
   cisco.meraki.organizations_wireless_controller_devices_interfaces_l3_usage_history_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +125,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info.py
index 83059900f..8ea323a0b 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info.py
@@ -5,110 +5,123 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces _packets _overview _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces _packets _overview _by _device.
-- Retrieve the packet counters for the interfaces of a Wireless LAN controller.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces _packets _overview
+    _by _device.
+  - Retrieve the packet counters for the interfaces of a Wireless LAN controller.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_packets_overview_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/packets/overview/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  names:
+    description:
+      - 'Names query parameter. Optional parameter to filter wireless LAN controller
+        by its interface name. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  names:
+  startingAfter:
     description:
-    - >
-      Names query parameter. Optional parameter to filter wireless LAN controller by its interface name. This
-      filter uses multiple exact matches.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 1 day from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 1 day from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 1 day after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 1 day after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 1 day. The
-      default is 1 hour.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 1 day. The default is
+        1 hour.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesPacketsOverviewByDevice
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesPacketsOverviewByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-packets-overview-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_packets_overview_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/packets/overview/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesPacketsOverviewByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-packets-overview-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesPacketsOverviewByDevice
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces _packets _overview _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces _packets _overview _by _device
+- name: Get all organizations _wireless _controller _devices _interfaces _packets
+    _overview _by _device
   cisco.meraki.organizations_wireless_controller_devices_interfaces_packets_overview_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     names: []
     t0: string
@@ -121,7 +134,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info.py b/plugins/modules/organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info.py
index d008428c0..35560a04f 100644
--- a/plugins/modules/organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info.py
@@ -5,110 +5,123 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info
-short_description: Information module for organizations _wireless _controller _devices _interfaces _usage _history _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _interfaces _usage _history _by _interval.
-- Retrieve the traffic for the interfaces of a Wireless LAN controller.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _interfaces _usage _history
+    _by _interval.
+  - Retrieve the traffic for the interfaces of a Wireless LAN controller.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_usage_history_by_interval,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/interfaces/usage/history/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  names:
+    description:
+      - 'Names query parameter. Optional parameter to filter wireless LAN controller
+        by its interface name. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  names:
+  startingAfter:
     description:
-    - >
-      Names query parameter. Optional parameter to filter wireless LAN controller by its interface name. This
-      filter uses multiple exact matches.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesUsageHistoryByInterval
-  description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesUsageHistoryByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-usage-history-by-interval
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_interfaces_usage_history_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/interfaces/usage/history/byInterval,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesInterfacesUsageHistoryByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-interfaces-usage-history-by-interval
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesInterfacesUsageHistoryByInterval
+short_description: Information module for organizations _wireless _controller _devices
+  _interfaces _usage _history _by _interval
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _interfaces _usage _history _by _interval
+- name: Get all organizations _wireless _controller _devices _interfaces _usage _history
+    _by _interval
   cisco.meraki.organizations_wireless_controller_devices_interfaces_usage_history_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     names: []
     t0: string
@@ -121,7 +134,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_redundancy_failover_history_info.py b/plugins/modules/organizations_wireless_controller_devices_redundancy_failover_history_info.py
index 1bf4acec1..53c55c6f8 100644
--- a/plugins/modules/organizations_wireless_controller_devices_redundancy_failover_history_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_redundancy_failover_history_info.py
@@ -5,103 +5,114 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_redundancy_failover_history_info
-short_description: Information module for organizations _wireless _controller _devices _redundancy _failover _history
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _redundancy _failover _history.
-- List the failover events of wireless LAN controllers in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _redundancy _failover _history.
+  - List the failover events of wireless LAN controllers in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_redundancy_failover_history_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_redundancy_failover_history,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/redundancy/failover/history,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesRedundancyFailoverHistory
-  description: Complete reference of the getOrganizationWirelessControllerDevicesRedundancyFailoverHistory API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-redundancy-failover-history
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_redundancy_failover_history,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/redundancy/failover/history,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesRedundancyFailoverHistory
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-redundancy-failover-history
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesRedundancyFailoverHistory
+short_description: Information module for organizations _wireless _controller _devices
+  _redundancy _failover _history
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _redundancy _failover _history
+- name: Get all organizations _wireless _controller _devices _redundancy _failover
+    _history
   cisco.meraki.organizations_wireless_controller_devices_redundancy_failover_history_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +124,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_redundancy_statuses_info.py b/plugins/modules/organizations_wireless_controller_devices_redundancy_statuses_info.py
index 2caf0d880..c3baff187 100644
--- a/plugins/modules/organizations_wireless_controller_devices_redundancy_statuses_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_redundancy_statuses_info.py
@@ -5,90 +5,98 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_redundancy_statuses_info
-short_description: Information module for organizations _wireless _controller _devices _redundancy _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _redundancy _statuses.
-- >
-   List redundancy details of wireless LAN controllers in an organization. The failover count refers to the total
-   failovers system happens from the moment of this device onboarding to Dashboard.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _redundancy _statuses.
+  - 'List redundancy details of wireless LAN controllers in an organization. The failover
+    count refers to the total failovers system happens from the moment of this device
+    onboarding to Dashboard.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_redundancy_statuses_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_redundancy_statuses,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/redundancy/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud IDs. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud IDs. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesRedundancyStatuses
-  description: Complete reference of the getOrganizationWirelessControllerDevicesRedundancyStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-redundancy-statuses
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_redundancy_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/redundancy/statuses,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesRedundancyStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-redundancy-statuses
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesRedundancyStatuses
+short_description: Information module for organizations _wireless _controller _devices
+  _redundancy _statuses
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _devices _redundancy _statuses
   cisco.meraki.organizations_wireless_controller_devices_redundancy_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     perPage: 0
     startingAfter: string
@@ -97,7 +105,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_devices_system_utilization_history_by_interval_info.py b/plugins/modules/organizations_wireless_controller_devices_system_utilization_history_by_interval_info.py
index 05a6992da..38e6f26a9 100644
--- a/plugins/modules/organizations_wireless_controller_devices_system_utilization_history_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_controller_devices_system_utilization_history_by_interval_info.py
@@ -5,103 +5,115 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_devices_system_utilization_history_by_interval_info
-short_description: Information module for organizations _wireless _controller _devices _system _utilization _history _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _devices _system _utilization _history _by _interval.
-- List cpu utilization data of wireless LAN controllers in an organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _devices _system _utilization _history
+    _by _interval.
+  - List cpu utilization data of wireless LAN controllers in an organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_devices_system_utilization_history_by_interval_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_devices_system_utilization_history_by_interval,
+  - Paths used are get /organizations/{organizationId}/wirelessController/devices/system/utilization/history/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
+  startingAfter:
+    description:
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesSystemUtilizationHistoryByInterval
-  description: Complete reference of the getOrganizationWirelessControllerDevicesSystemUtilizationHistoryByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-system-utilization-history-by-interval
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_devices_system_utilization_history_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/devices/system/utilization/history/byInterval,
+  - description: Complete reference of the getOrganizationWirelessControllerDevicesSystemUtilizationHistoryByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-devices-system-utilization-history-by-interval
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerDevicesSystemUtilizationHistoryByInterval
+short_description: Information module for organizations _wireless _controller _devices
+  _system _utilization _history _by _interval
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _controller _devices _system _utilization _history _by _interval
+- name: Get all organizations _wireless _controller _devices _system _utilization
+    _history _by _interval
   cisco.meraki.organizations_wireless_controller_devices_system_utilization_history_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     serials: []
     t0: string
     t1: string
@@ -113,7 +125,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_controller_overview_by_device_info.py b/plugins/modules/organizations_wireless_controller_overview_by_device_info.py
index f898aa4b2..8ac587255 100644
--- a/plugins/modules/organizations_wireless_controller_overview_by_device_info.py
+++ b/plugins/modules/organizations_wireless_controller_overview_by_device_info.py
@@ -5,95 +5,103 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_controller_overview_by_device_info
-short_description: Information module for organizations _wireless _controller _overview _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _controller _overview _by _device.
-- List the overview information of wireless LAN controllers in an organization and it is updated every minute.
-version_added: '2.20.0'
+  - Get all organizations _wireless _controller _overview _by _device.
+  - List the overview information of wireless LAN controllers in an organization and
+    it is updated every minute.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_controller_overview_by_device_info
+notes:
+  - SDK Method used are wireless_controller.WirelessController.get_organization_wireless_controller_overview_by_device,
+  - Paths used are get /organizations/{organizationId}/wirelessController/overview/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter wireless LAN controllers by network ID. This filter
-      uses multiple exact matches.
+      - 'NetworkIds query parameter. Optional parameter to filter wireless LAN controllers
+        by network ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  serials:
+  organizationId:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter wireless LAN controller by its cloud ID. This filter
-      uses multiple exact matches.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - 'Serials query parameter. Optional parameter to filter wireless LAN controller
+        by its cloud ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerOverviewByDevice
-  description: Complete reference of the getOrganizationWirelessControllerOverviewByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-overview-by-device
-notes:
-  - SDK Method used are
-    wireless_controller.WirelessController.get_organization_wireless_controller_overview_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wirelessController/overview/byDevice,
+  - description: Complete reference of the getOrganizationWirelessControllerOverviewByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-controller-overview-by-device
+    name: Cisco Meraki documentation for wirelessController getOrganizationWirelessControllerOverviewByDevice
+short_description: Information module for organizations _wireless _controller _overview
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _controller _overview _by _device
   cisco.meraki.organizations_wireless_controller_overview_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     perPage: 0
@@ -103,7 +111,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_channel_utilization_by_device_info.py b/plugins/modules/organizations_wireless_devices_channel_utilization_by_device_info.py
index 5e49b4f17..392391b8d 100644
--- a/plugins/modules/organizations_wireless_devices_channel_utilization_by_device_info.py
+++ b/plugins/modules/organizations_wireless_devices_channel_utilization_by_device_info.py
@@ -5,112 +5,123 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_channel_utilization_by_device_info
-short_description: Information module for organizations _wireless _devices _channel _utilization _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _channel _utilization _by _device.
-- Get average channel utilization for all bands in a network, split by AP.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _channel _utilization _by _device.
+  - Get average channel utilization for all bands in a network, split by AP.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_channel_utilization_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_channel_utilization_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/channelUtilization/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  interval:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 300, 600, 3600, 7200, 14400, 21600. The default is
+        3600.
+
+        '
+    type: int
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
-  serials:
+  organizationId:
     description:
-    - Serials query parameter. Filter results by device.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Serials query parameter. Filter results by device.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 90 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 90 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 90 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 90 days. The default
+        is 7 days.
+
+        '
     type: float
-  interval:
-    description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 300, 600,
-      3600, 7200, 14400, 21600. The default is 3600.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationByDevice
-  description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_channel_utilization_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/channelUtilization/byDevice,
+  - description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationByDevice
+short_description: Information module for organizations _wireless _devices _channel
+  _utilization _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _channel _utilization _by _device
   cisco.meraki.organizations_wireless_devices_channel_utilization_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     perPage: 0
@@ -124,7 +135,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_channel_utilization_by_network_info.py b/plugins/modules/organizations_wireless_devices_channel_utilization_by_network_info.py
index 0896fc8a3..685427ca4 100644
--- a/plugins/modules/organizations_wireless_devices_channel_utilization_by_network_info.py
+++ b/plugins/modules/organizations_wireless_devices_channel_utilization_by_network_info.py
@@ -5,112 +5,123 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_channel_utilization_by_network_info
-short_description: Information module for organizations _wireless _devices _channel _utilization _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _channel _utilization _by _network.
-- Get average channel utilization across all bands for all networks in the organization.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _channel _utilization _by _network.
+  - Get average channel utilization across all bands for all networks in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_channel_utilization_by_network_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_channel_utilization_by_network,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/channelUtilization/byNetwork,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  interval:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 300, 600, 3600, 7200, 14400, 21600. The default is
+        3600.
+
+        '
+    type: int
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
-  serials:
+  organizationId:
     description:
-    - Serials query parameter. Filter results by device.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Serials query parameter. Filter results by device.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 90 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 90 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 90 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 90 days. The default
+        is 7 days.
+
+        '
     type: float
-  interval:
-    description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 300, 600,
-      3600, 7200, 14400, 21600. The default is 3600.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationByNetwork
-  description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-by-network
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_channel_utilization_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/channelUtilization/byNetwork,
+  - description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-by-network
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationByNetwork
+short_description: Information module for organizations _wireless _devices _channel
+  _utilization _by _network
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _channel _utilization _by _network
   cisco.meraki.organizations_wireless_devices_channel_utilization_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     perPage: 0
@@ -124,7 +135,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info.py b/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info.py
index 308d6e687..ba11ed3c9 100644
--- a/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info.py
@@ -5,112 +5,125 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info
-short_description: Information module for organizations _wireless _devices _channel _utilization _history _by _device _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _channel _utilization _history _by _device _by _interval.
-- Get a time-series of average channel utilization for all bands, segmented by device.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _channel _utilization _history _by _device
+    _by _interval.
+  - Get a time-series of average channel utilization for all bands, segmented by device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_channel_utilization_history_by_device_by_interval,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/channelUtilization/history/byDevice/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  interval:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 300, 600, 3600, 7200, 14400, 21600. The default is
+        3600.
+
+        '
+    type: int
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
-  serials:
+  organizationId:
     description:
-    - Serials query parameter. Filter results by device.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Serials query parameter. Filter results by device.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  interval:
-    description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 300, 600,
-      3600, 7200, 14400, 21600. The default is 3600.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationHistoryByDeviceByInterval
-  description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationHistoryByDeviceByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-history-by-device-by-interval
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_channel_utilization_history_by_device_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/channelUtilization/history/byDevice/byInterval,
+  - description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationHistoryByDeviceByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-history-by-device-by-interval
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationHistoryByDeviceByInterval
+short_description: Information module for organizations _wireless _devices _channel
+  _utilization _history _by _device _by _interval
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _devices _channel _utilization _history _by _device _by _interval
+- name: Get all organizations _wireless _devices _channel _utilization _history _by
+    _device _by _interval
   cisco.meraki.organizations_wireless_devices_channel_utilization_history_by_device_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     perPage: 0
@@ -124,7 +137,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info.py b/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info.py
index 9f6bdfa4d..ddff10149 100644
--- a/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info.py
+++ b/plugins/modules/organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info.py
@@ -5,112 +5,125 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info
-short_description: Information module for organizations _wireless _devices _channel _utilization _history _by _network _by _interval
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _channel _utilization _history _by _network _by _interval.
-- Get a time-series of average channel utilization for all bands.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _channel _utilization _history _by _network
+    _by _interval.
+  - Get a time-series of average channel utilization for all bands.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_channel_utilization_history_by_network_by_interval,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/channelUtilization/history/byNetwork/byInterval,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  interval:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
+      - 'Interval query parameter. The time interval in seconds for returned data.
+        The valid intervals are 300, 600, 3600, 7200, 14400, 21600. The default is
+        3600.
+
+        '
+    type: int
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
-  serials:
+  organizationId:
     description:
-    - Serials query parameter. Filter results by device.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Serials query parameter. Filter results by device.
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 31 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 31 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 31 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The
-      default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be less than or equal to 31 days. The default
+        is 7 days.
+
+        '
     type: float
-  interval:
-    description:
-    - >
-      Interval query parameter. The time interval in seconds for returned data. The valid intervals are 300, 600,
-      3600, 7200, 14400, 21600. The default is 3600.
-    type: int
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationHistoryByNetworkByInterval
-  description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationHistoryByNetworkByInterval API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-history-by-network-by-interval
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_channel_utilization_history_by_network_by_interval,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/channelUtilization/history/byNetwork/byInterval,
+  - description: Complete reference of the getOrganizationWirelessDevicesChannelUtilizationHistoryByNetworkByInterval
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-channel-utilization-history-by-network-by-interval
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesChannelUtilizationHistoryByNetworkByInterval
+short_description: Information module for organizations _wireless _devices _channel
+  _utilization _history _by _network _by _interval
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
-- name: Get all organizations _wireless _devices _channel _utilization _history _by _network _by _interval
+- name: Get all organizations _wireless _devices _channel _utilization _history _by
+    _network _by _interval
   cisco.meraki.organizations_wireless_devices_channel_utilization_history_by_network_by_interval_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     perPage: 0
@@ -124,7 +137,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_ethernet_statuses_info.py b/plugins/modules/organizations_wireless_devices_ethernet_statuses_info.py
index 0eaad0bcb..abf8dd53e 100644
--- a/plugins/modules/organizations_wireless_devices_ethernet_statuses_info.py
+++ b/plugins/modules/organizations_wireless_devices_ethernet_statuses_info.py
@@ -5,90 +5,97 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_ethernet_statuses_info
-short_description: Information module for organizations _wireless _devices _ethernet _statuses
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _ethernet _statuses.
-- >
-   List the most recent Ethernet link speed, duplex, aggregation and power mode and status information for wireless
-   devices.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _ethernet _statuses.
+  - 'List the most recent Ethernet link speed, duplex, aggregation and power mode
+    and status information for wireless devices.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_ethernet_statuses_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_ethernet_statuses,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/ethernet/statuses,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
+  networkIds:
+    description:
+      - 'NetworkIds query parameter. A list of Meraki network IDs to filter results
+        to contain only specified networks. E.g. NetworkIds=N_12345678&networkIds=L_3456.
+
+        '
+    elements: str
+    type: list
   organizationId:
     description:
-    - OrganizationId path parameter. Organization ID.
+      - OrganizationId path parameter. Organization ID.
     type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 100.
     type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
-  networkIds:
-    description:
-    - >
-      NetworkIds query parameter. A list of Meraki network IDs to filter results to contain only specified
-      networks. E.g. NetworkIds=N_12345678&networkIds=L_3456.
-    elements: str
-    type: list
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesEthernetStatuses
-  description: Complete reference of the getOrganizationWirelessDevicesEthernetStatuses API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-ethernet-statuses
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_ethernet_statuses,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/ethernet/statuses,
+  - description: Complete reference of the getOrganizationWirelessDevicesEthernetStatuses
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-ethernet-statuses
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesEthernetStatuses
+short_description: Information module for organizations _wireless _devices _ethernet
+  _statuses
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _ethernet _statuses
   cisco.meraki.organizations_wireless_devices_ethernet_statuses_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -97,7 +104,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_packet_loss_by_client_info.py b/plugins/modules/organizations_wireless_devices_packet_loss_by_client_info.py
index 40740e0b7..c845a88f1 100644
--- a/plugins/modules/organizations_wireless_devices_packet_loss_by_client_info.py
+++ b/plugins/modules/organizations_wireless_devices_packet_loss_by_client_info.py
@@ -5,116 +5,126 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_packet_loss_by_client_info
-short_description: Information module for organizations _wireless _devices _packet _loss _by _client
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _packet _loss _by _client.
-- Get average packet loss for the given timespan for all clients in the organization.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _packet _loss _by _client.
+  - Get average packet loss for the given timespan for all clients in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_packet_loss_by_client_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_packet_loss_by_client,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/packetLoss/byClient,
 options:
-  headers:
-    description: Additional headers.
-    type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  networkIds:
+  bands:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and
+        6.
     elements: str
     type: list
-  ssids:
+  endingBefore:
     description:
-    - Ssids query parameter. Filter results by SSID number.
-    elements: int
-    type: list
-  bands:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
+  headers:
+    description: Additional headers.
+    type: dict
+  macs:
     description:
-    - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and 6.
+      - Macs query parameter. Filter results by client mac address(es).
     elements: str
     type: list
-  macs:
+  networkIds:
     description:
-    - Macs query parameter. Filter results by client mac address(es).
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
     type: int
-  startingAfter:
+  ssids:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - Ssids query parameter. Filter results by SSID number.
+    elements: int
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 90 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 90 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 5 minutes and
-      be less than or equal to 90 days. The default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 5 minutes and be
+        less than or equal to 90 days. The default is 7 days.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByClient
-  description: Complete reference of the getOrganizationWirelessDevicesPacketLossByClient API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-client
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_packet_loss_by_client,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/packetLoss/byClient,
+  - description: Complete reference of the getOrganizationWirelessDevicesPacketLossByClient
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-client
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByClient
+short_description: Information module for organizations _wireless _devices _packet
+  _loss _by _client
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _packet _loss _by _client
   cisco.meraki.organizations_wireless_devices_packet_loss_by_client_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     ssids: []
     bands: []
@@ -129,7 +139,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_packet_loss_by_device_info.py b/plugins/modules/organizations_wireless_devices_packet_loss_by_device_info.py
index 7be871f02..1c650eeac 100644
--- a/plugins/modules/organizations_wireless_devices_packet_loss_by_device_info.py
+++ b/plugins/modules/organizations_wireless_devices_packet_loss_by_device_info.py
@@ -5,118 +5,129 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_packet_loss_by_device_info
-short_description: Information module for organizations _wireless _devices _packet _loss _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _packet _loss _by _device.
-- >
-   Get average packet loss for the given timespan for all devices in the organization. Does not include device's own
-   traffic.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _packet _loss _by _device.
+  - 'Get average packet loss for the given timespan for all devices in the organization.
+    Does not include device''s own traffic.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_packet_loss_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_packet_loss_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/packetLoss/byDevice,
 options:
+  bands:
+    description:
+      - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and
+        6.
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - Serials query parameter. Filter results by device.
+      - Serials query parameter. Filter results by device.
     elements: str
     type: list
   ssids:
     description:
-    - Ssids query parameter. Filter results by SSID number.
+      - Ssids query parameter. Filter results by SSID number.
     elements: int
     type: list
-  bands:
-    description:
-    - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and 6.
-    elements: str
-    type: list
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 90 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 90 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 5 minutes and
-      be less than or equal to 90 days. The default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 5 minutes and be
+        less than or equal to 90 days. The default is 7 days.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByDevice
-  description: Complete reference of the getOrganizationWirelessDevicesPacketLossByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_packet_loss_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/packetLoss/byDevice,
+  - description: Complete reference of the getOrganizationWirelessDevicesPacketLossByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByDevice
+short_description: Information module for organizations _wireless _devices _packet
+  _loss _by _device
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _packet _loss _by _device
   cisco.meraki.organizations_wireless_devices_packet_loss_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     ssids: []
@@ -131,7 +142,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_packet_loss_by_network_info.py b/plugins/modules/organizations_wireless_devices_packet_loss_by_network_info.py
index b9b367e1f..0715083b1 100644
--- a/plugins/modules/organizations_wireless_devices_packet_loss_by_network_info.py
+++ b/plugins/modules/organizations_wireless_devices_packet_loss_by_network_info.py
@@ -5,116 +5,126 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_packet_loss_by_network_info
-short_description: Information module for organizations _wireless _devices _packet _loss _by _network
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _packet _loss _by _network.
-- Get average packet loss for the given timespan for all networks in the organization.
-version_added: '2.16.0'
+  - Get all organizations _wireless _devices _packet _loss _by _network.
+  - Get average packet loss for the given timespan for all networks in the organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_packet_loss_by_network_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_packet_loss_by_network,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/packetLoss/byNetwork,
 options:
+  bands:
+    description:
+      - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and
+        6.
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - NetworkIds query parameter. Filter results by network.
+      - NetworkIds query parameter. Filter results by network.
     elements: str
     type: list
+  organizationId:
+    description:
+      - OrganizationId path parameter. Organization ID.
+    type: str
+  perPage:
+    description:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
   serials:
     description:
-    - Serials query parameter. Filter results by device.
+      - Serials query parameter. Filter results by device.
     elements: str
     type: list
   ssids:
     description:
-    - Ssids query parameter. Filter results by SSID number.
+      - Ssids query parameter. Filter results by SSID number.
     elements: int
     type: list
-  bands:
-    description:
-    - Bands query parameter. Filter results by band. Valid bands are 2.4, 5, and 6.
-    elements: str
-    type: list
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
   startingAfter:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
-    description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
   t0:
     description:
-    - T0 query parameter. The beginning of the timespan for the data. The maximum lookback period is 90 days from today.
+      - T0 query parameter. The beginning of the timespan for the data. The maximum
+        lookback period is 90 days from today.
     type: str
   t1:
     description:
-    - T1 query parameter. The end of the timespan for the data. T1 can be a maximum of 90 days after t0.
+      - T1 query parameter. The end of the timespan for the data. T1 can be a maximum
+        of 90 days after t0.
     type: str
   timespan:
     description:
-    - >
-      Timespan query parameter. The timespan for which the information will be fetched. If specifying timespan, do
-      not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 5 minutes and
-      be less than or equal to 90 days. The default is 7 days.
+      - 'Timespan query parameter. The timespan for which the information will be
+        fetched. If specifying timespan, do not specify parameters t0 and t1. The
+        value must be in seconds and be greater than or equal to 5 minutes and be
+        less than or equal to 90 days. The default is 7 days.
+
+        '
     type: float
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByNetwork
-  description: Complete reference of the getOrganizationWirelessDevicesPacketLossByNetwork API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-network
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_packet_loss_by_network,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/packetLoss/byNetwork,
+  - description: Complete reference of the getOrganizationWirelessDevicesPacketLossByNetwork
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-packet-loss-by-network
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesPacketLossByNetwork
+short_description: Information module for organizations _wireless _devices _packet
+  _loss _by _network
+version_added: 2.16.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _packet _loss _by _network
   cisco.meraki.organizations_wireless_devices_packet_loss_by_network_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     ssids: []
@@ -129,7 +139,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_devices_wireless_controllers_by_device_info.py b/plugins/modules/organizations_wireless_devices_wireless_controllers_by_device_info.py
index bccbf5ac0..1d2907e49 100644
--- a/plugins/modules/organizations_wireless_devices_wireless_controllers_by_device_info.py
+++ b/plugins/modules/organizations_wireless_devices_wireless_controllers_by_device_info.py
@@ -5,102 +5,110 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_devices_wireless_controllers_by_device_info
-short_description: Information module for organizations _wireless _devices _wireless _controllers _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _devices _wireless _controllers _by _device.
-- List of Catalyst access points information.
-version_added: '2.20.0'
+  - Get all organizations _wireless _devices _wireless _controllers _by _device.
+  - List of Catalyst access points information.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_devices_wireless_controllers_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_devices_wireless_controllers_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/devices/wirelessControllers/byDevice,
 options:
+  controllerSerials:
+    description:
+      - 'ControllerSerials query parameter. Optional parameter to filter access points
+        by its wireless LAN controller cloud ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
   networkIds:
     description:
-    - >
-      NetworkIds query parameter. Optional parameter to filter access points by network ID. This filter uses
-      multiple exact matches.
-    elements: str
-    type: list
-  serials:
-    description:
-    - >
-      Serials query parameter. Optional parameter to filter access points by its cloud ID. This filter uses
-      multiple exact matches.
+      - 'NetworkIds query parameter. Optional parameter to filter access points by
+        network ID. This filter uses multiple exact matches.
+
+        '
     elements: str
     type: list
-  controllerSerials:
+  organizationId:
     description:
-    - >
-      ControllerSerials query parameter. Optional parameter to filter access points by its wireless LAN controller
-      cloud ID. This filter uses multiple exact matches.
-    elements: str
-    type: list
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 100.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - 'Serials query parameter. Optional parameter to filter access points by its
+        cloud ID. This filter uses multiple exact matches.
+
+        '
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesWirelessControllersByDevice
-  description: Complete reference of the getOrganizationWirelessDevicesWirelessControllersByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-wireless-controllers-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_devices_wireless_controllers_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/devices/wirelessControllers/byDevice,
+  - description: Complete reference of the getOrganizationWirelessDevicesWirelessControllersByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-wireless-controllers-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessDevicesWirelessControllersByDevice
+short_description: Information module for organizations _wireless _devices _wireless
+  _controllers _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _devices _wireless _controllers _by _device
   cisco.meraki.organizations_wireless_devices_wireless_controllers_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     controllerSerials: []
@@ -111,7 +119,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_radio_auto_rf_channels_recalculate.py b/plugins/modules/organizations_wireless_radio_auto_rf_channels_recalculate.py
index 70e60d429..d23c677d5 100644
--- a/plugins/modules/organizations_wireless_radio_auto_rf_channels_recalculate.py
+++ b/plugins/modules/organizations_wireless_radio_auto_rf_channels_recalculate.py
@@ -5,18 +5,21 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_radio_auto_rf_channels_recalculate
-short_description: Resource module for organizations _wireless _radio _auto _rf _channels _recalculate
+author: Francisco Munoz (@fmunoz)
 description:
-- Manage operation create of the resource organizations _wireless _radio _auto _rf _channels _recalculate.
-- >
-   Recalculates automatically assigned channels for every AP within specified the specified networks. Note This could
-   cause a brief loss in connectivity for wireless clients.
-version_added: '2.20.0'
+  - Manage operation create of the resource organizations _wireless _radio _auto _rf
+    _channels _recalculate.
+  - 'Recalculates automatically assigned channels for every AP within specified the
+    specified networks. Note This could cause a brief loss in connectivity for wireless
+    clients.
+
+    '
 extends_documentation_fragment:
   - cisco.meraki.module
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_radio_auto_rf_channels_recalculate
+notes:
+  - SDK Method used are wireless.Wireless.recalculate_organization_wireless_radio_auto_rf_channels,
+  - Paths used are post /organizations/{organizationId}/wireless/radio/autoRf/channels/recalculate,
 options:
   networkIds:
     description: A list of network ids (limit 15).
@@ -26,48 +29,45 @@
     description: OrganizationId path parameter. Organization ID.
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless recalculateOrganizationWirelessRadioAutoRfChannels
-  description: Complete reference of the recalculateOrganizationWirelessRadioAutoRfChannels API.
-  link: https://developer.cisco.com/meraki/api-v1/#!recalculate-organization-wireless-radio-auto-rf-channels
-notes:
-  - SDK Method used are
-    wireless.Wireless.recalculate_organization_wireless_radio_auto_rf_channels,
-
-  - Paths used are
-    post /organizations/{organizationId}/wireless/radio/autoRf/channels/recalculate,
+  - description: Complete reference of the recalculateOrganizationWirelessRadioAutoRfChannels
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!recalculate-organization-wireless-radio-auto-rf-channels
+    name: Cisco Meraki documentation for wireless recalculateOrganizationWirelessRadioAutoRfChannels
+short_description: Resource module for organizations _wireless _radio _auto _rf _channels
+  _recalculate
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Create
   cisco.meraki.organizations_wireless_radio_auto_rf_channels_recalculate:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds:
-    - N_678910
-    - L_12345
+      - N_678910
+      - L_12345
     organizationId: string
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_rf_profiles_assignments_by_device_info.py b/plugins/modules/organizations_wireless_rf_profiles_assignments_by_device_info.py
index 66bb62177..7e015b594 100644
--- a/plugins/modules/organizations_wireless_rf_profiles_assignments_by_device_info.py
+++ b/plugins/modules/organizations_wireless_rf_profiles_assignments_by_device_info.py
@@ -5,139 +5,159 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_rf_profiles_assignments_by_device_info
-short_description: Information module for organizations _wireless _rf _profiles _assignments _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _rf _profiles _assignments _by _device.
-- List the RF profiles of an organization by device.
-version_added: '2.20.0'
+  - Get all organizations _wireless _rf _profiles _assignments _by _device.
+  - List the RF profiles of an organization by device.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_rf_profiles_assignments_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_rf_profiles_assignments_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/rfProfiles/assignments/byDevice,
 options:
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
-    description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
-  perPage:
-    description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000.
-    type: int
-  startingAfter:
-    description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+  mac:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'Mac query parameter. Optional parameter to filter RF profiles by device MAC
+        address. All returned devices will have a MAC address that contains the search
+        term or is an exact match.
+
+        '
     type: str
-  networkIds:
+  macs:
     description:
-    - NetworkIds query parameter. Optional parameter to filter devices by network.
+      - 'Macs query parameter. Optional parameter to filter RF profiles by one or
+        more device MAC addresses. All returned devices will have a MAC address that
+        is an exact match.
+
+        '
     elements: str
     type: list
-  productTypes:
+  model:
+    description:
+      - 'Model query parameter. Optional parameter to filter RF profiles by device
+        model. All returned devices will have a model that contains the search term
+        or is an exact match.
+
+        '
+    type: str
+  models:
     description:
-    - >
-      ProductTypes query parameter. Optional parameter to filter devices by product type. Valid types are
-      wireless, appliance, switch, systemsManager, camera, cellularGateway, sensor, wirelessController, and
-      secureConnect.
+      - 'Models query parameter. Optional parameter to filter RF profiles by one or
+        more device models. All returned devices will have a model that is an exact
+        match.
+
+        '
     elements: str
     type: list
   name:
     description:
-    - >
-      Name query parameter. Optional parameter to filter RF profiles by device name. All returned devices will
-      have a name that contains the search term or is an exact match.
+      - 'Name query parameter. Optional parameter to filter RF profiles by device
+        name. All returned devices will have a name that contains the search term
+        or is an exact match.
+
+        '
     type: str
-  mac:
+  networkIds:
     description:
-    - >
-      Mac query parameter. Optional parameter to filter RF profiles by device MAC address. All returned devices
-      will have a MAC address that contains the search term or is an exact match.
-    type: str
-  serial:
+      - NetworkIds query parameter. Optional parameter to filter devices by network.
+    elements: str
+    type: list
+  organizationId:
     description:
-    - >
-      Serial query parameter. Optional parameter to filter RF profiles by device serial number. All returned
-      devices will have a serial number that contains the search term or is an exact match.
+      - OrganizationId path parameter. Organization ID.
     type: str
-  model:
+  perPage:
     description:
-    - >
-      Model query parameter. Optional parameter to filter RF profiles by device model. All returned devices will
-      have a model that contains the search term or is an exact match.
-    type: str
-  macs:
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 1000. Default is 1000.
+    type: int
+  productTypes:
     description:
-    - >
-      Macs query parameter. Optional parameter to filter RF profiles by one or more device MAC addresses. All
-      returned devices will have a MAC address that is an exact match.
+      - 'ProductTypes query parameter. Optional parameter to filter devices by product
+        type. Valid types are wireless, appliance, switch, systemsManager, camera,
+        cellularGateway, sensor, wirelessController, and secureConnect.
+
+        '
     elements: str
     type: list
+  serial:
+    description:
+      - 'Serial query parameter. Optional parameter to filter RF profiles by device
+        serial number. All returned devices will have a serial number that contains
+        the search term or is an exact match.
+
+        '
+    type: str
   serials:
     description:
-    - >
-      Serials query parameter. Optional parameter to filter RF profiles by one or more device serial numbers. All
-      returned devices will have a serial number that is an exact match.
+      - 'Serials query parameter. Optional parameter to filter RF profiles by one
+        or more device serial numbers. All returned devices will have a serial number
+        that is an exact match.
+
+        '
     elements: str
     type: list
-  models:
+  startingAfter:
     description:
-    - >
-      Models query parameter. Optional parameter to filter RF profiles by one or more device models. All returned
-      devices will have a model that is an exact match.
-    elements: str
-    type: list
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessRfProfilesAssignmentsByDevice
-  description: Complete reference of the getOrganizationWirelessRfProfilesAssignmentsByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-rf-profiles-assignments-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_rf_profiles_assignments_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/rfProfiles/assignments/byDevice,
+  - description: Complete reference of the getOrganizationWirelessRfProfilesAssignmentsByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-rf-profiles-assignments-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessRfProfilesAssignmentsByDevice
+short_description: Information module for organizations _wireless _rf _profiles _assignments
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _rf _profiles _assignments _by _device
   cisco.meraki.organizations_wireless_rf_profiles_assignments_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -154,7 +174,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/modules/organizations_wireless_ssids_statuses_by_device_info.py b/plugins/modules/organizations_wireless_ssids_statuses_by_device_info.py
index 5700b759b..3d71887c0 100644
--- a/plugins/modules/organizations_wireless_ssids_statuses_by_device_info.py
+++ b/plugins/modules/organizations_wireless_ssids_statuses_by_device_info.py
@@ -5,106 +5,115 @@
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 DOCUMENTATION = r"""
----
-module: organizations_wireless_ssids_statuses_by_device_info
-short_description: Information module for organizations _wireless _ssids _statuses _by _device
+author: Francisco Munoz (@fmunoz)
 description:
-- Get all organizations _wireless _ssids _statuses _by _device.
-- List status information of all BSSIDs in your organization.
-version_added: '2.20.0'
+  - Get all organizations _wireless _ssids _statuses _by _device.
+  - List status information of all BSSIDs in your organization.
 extends_documentation_fragment:
   - cisco.meraki.module_info
   - cisco.meraki.module_info_pagination
-author: Francisco Munoz (@fmunoz)
+module: organizations_wireless_ssids_statuses_by_device_info
+notes:
+  - SDK Method used are wireless.Wireless.get_organization_wireless_ssids_statuses_by_device,
+  - Paths used are get /organizations/{organizationId}/wireless/ssids/statuses/byDevice,
 options:
+  bssids:
+    description:
+      - Bssids query parameter. A list of BSSIDs. The returned devices will be filtered
+        to only include these BSSIDs.
+    elements: str
+    type: list
+  endingBefore:
+    description:
+      - 'EndingBefore query parameter. A token used by the server to indicate the
+        end of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
+    type: str
   headers:
     description: Additional headers.
     type: dict
-  organizationId:
+  hideDisabled:
     description:
-    - OrganizationId path parameter. Organization ID.
-    type: str
+      - HideDisabled query parameter. If true, the returned devices will not include
+        disabled SSIDs. (default true).
+    type: bool
   networkIds:
     description:
-    - NetworkIds query parameter. Optional parameter to filter the result set by the included set of network IDs.
-    elements: str
-    type: list
-  serials:
-    description:
-    - >
-      Serials query parameter. A list of serial numbers. The returned devices will be filtered to only include
-      these serials.
+      - NetworkIds query parameter. Optional parameter to filter the result set by
+        the included set of network IDs.
     elements: str
     type: list
-  bssids:
-    description:
-    - Bssids query parameter. A list of BSSIDs. The returned devices will be filtered to only include these BSSIDs.
-    elements: str
-    type: list
-  hideDisabled:
+  organizationId:
     description:
-    - HideDisabled query parameter. If true, the returned devices will not include disabled SSIDs. (default true).
-    type: bool
+      - OrganizationId path parameter. Organization ID.
+    type: str
   perPage:
     description:
-    - PerPage query parameter. The number of entries per page returned. Acceptable range is 3 - 500. Default is 100.
+      - PerPage query parameter. The number of entries per page returned. Acceptable
+        range is 3 - 500. Default is 100.
     type: int
-  startingAfter:
+  serials:
     description:
-    - >
-      StartingAfter query parameter. A token used by the server to indicate the start of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
-    type: str
-  endingBefore:
+      - 'Serials query parameter. A list of serial numbers. The returned devices will
+        be filtered to only include these serials.
+
+        '
+    elements: str
+    type: list
+  startingAfter:
     description:
-    - >
-      EndingBefore query parameter. A token used by the server to indicate the end of the page. Often this is a
-      timestamp or an ID but it is not limited to those. This parameter should not be defined by client
-      applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
+      - 'StartingAfter query parameter. A token used by the server to indicate the
+        start of the page. Often this is a timestamp or an ID but it is not limited
+        to those. This parameter should not be defined by client applications. The
+        link for the first, last, prev, or next page in the HTTP Link header should
+        define it.
+
+        '
     type: str
 requirements:
-- meraki >= 2.4.9
-- python >= 3.5
+  - meraki >= 2.4.9
+  - python >= 3.5
 seealso:
-- name: Cisco Meraki documentation for wireless getOrganizationWirelessSsidsStatusesByDevice
-  description: Complete reference of the getOrganizationWirelessSsidsStatusesByDevice API.
-  link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-ssids-statuses-by-device
-notes:
-  - SDK Method used are
-    wireless.Wireless.get_organization_wireless_ssids_statuses_by_device,
-
-  - Paths used are
-    get /organizations/{organizationId}/wireless/ssids/statuses/byDevice,
+  - description: Complete reference of the getOrganizationWirelessSsidsStatusesByDevice
+      API.
+    link: https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-ssids-statuses-by-device
+    name: Cisco Meraki documentation for wireless getOrganizationWirelessSsidsStatusesByDevice
+short_description: Information module for organizations _wireless _ssids _statuses
+  _by _device
+version_added: 2.20.0
 """
 
 EXAMPLES = r"""
 - name: Get all organizations _wireless _ssids _statuses _by _device
   cisco.meraki.organizations_wireless_ssids_statuses_by_device_info:
-    meraki_api_key: "{{meraki_api_key}}"
-    meraki_base_url: "{{meraki_base_url}}"
-    meraki_single_request_timeout: "{{meraki_single_request_timeout}}"
-    meraki_certificate_path: "{{meraki_certificate_path}}"
-    meraki_requests_proxy: "{{meraki_requests_proxy}}"
-    meraki_wait_on_rate_limit: "{{meraki_wait_on_rate_limit}}"
-    meraki_nginx_429_retry_wait_time: "{{meraki_nginx_429_retry_wait_time}}"
-    meraki_action_batch_retry_wait_time: "{{meraki_action_batch_retry_wait_time}}"
-    meraki_retry_4xx_error: "{{meraki_retry_4xx_error}}"
-    meraki_retry_4xx_error_wait_time: "{{meraki_retry_4xx_error_wait_time}}"
-    meraki_maximum_retries: "{{meraki_maximum_retries}}"
-    meraki_output_log: "{{meraki_output_log}}"
-    meraki_log_file_prefix: "{{meraki_log_file_prefix}}"
-    meraki_log_path: "{{meraki_log_path}}"
-    meraki_print_console: "{{meraki_print_console}}"
-    meraki_suppress_logging: "{{meraki_suppress_logging}}"
-    meraki_simulate: "{{meraki_simulate}}"
-    meraki_be_geo_id: "{{meraki_be_geo_id}}"
-    meraki_use_iterator_for_get_pages: "{{meraki_use_iterator_for_get_pages}}"
-    meraki_inherit_logging_config: "{{meraki_inherit_logging_config}}"
+    meraki_api_key: '{{ meraki_api_key }}'
+    meraki_base_url: '{{ meraki_base_url }}'
+    meraki_single_request_timeout: '{{ meraki_single_request_timeout }}'
+    meraki_certificate_path: '{{ meraki_certificate_path }}'
+    meraki_requests_proxy: '{{ meraki_requests_proxy }}'
+    meraki_wait_on_rate_limit: '{{ meraki_wait_on_rate_limit }}'
+    meraki_nginx_429_retry_wait_time: '{{ meraki_nginx_429_retry_wait_time }}'
+    meraki_action_batch_retry_wait_time: '{{ meraki_action_batch_retry_wait_time }}'
+    meraki_retry_4xx_error: '{{ meraki_retry_4xx_error }}'
+    meraki_retry_4xx_error_wait_time: '{{ meraki_retry_4xx_error_wait_time }}'
+    meraki_maximum_retries: '{{ meraki_maximum_retries }}'
+    meraki_output_log: '{{ meraki_output_log }}'
+    meraki_log_file_prefix: '{{ meraki_log_file_prefix }}'
+    meraki_log_path: '{{ meraki_log_path }}'
+    meraki_print_console: '{{ meraki_print_console }}'
+    meraki_suppress_logging: '{{ meraki_suppress_logging }}'
+    meraki_simulate: '{{ meraki_simulate }}'
+    meraki_be_geo_id: '{{ meraki_be_geo_id }}'
+    meraki_use_iterator_for_get_pages: '{{ meraki_use_iterator_for_get_pages }}'
+    meraki_inherit_logging_config: '{{ meraki_inherit_logging_config }}'
     networkIds: []
     serials: []
     bssids: []
-    hideDisabled: True
+    hideDisabled: true
     perPage: 0
     startingAfter: string
     endingBefore: string
@@ -112,7 +121,6 @@
     total_pages: -1
     direction: next
   register: result
-
 """
 RETURN = r"""
 meraki_response:
diff --git a/plugins/plugin_utils/meraki.py b/plugins/plugin_utils/meraki.py
index 8f55358af..3598d2f5d 100644
--- a/plugins/plugin_utils/meraki.py
+++ b/plugins/plugin_utils/meraki.py
@@ -229,7 +229,7 @@ def __init__(self, params):
                 suppress_logging=params.get("meraki_suppress_logging"),
                 simulate=params.get("meraki_simulate"),
                 be_geo_id=params.get("meraki_be_geo_id"),
-                caller="MerakiAnsibleCollection/2.20.3 Cisco",
+                caller="MerakiAnsibleCollection/2.20.4 Cisco",
                 use_iterator_for_get_pages=params.get(
                     "meraki_use_iterator_for_get_pages"),
                 inherit_logging_config=params.get(
diff --git a/tests/integration/targets/meraki_action_batch/tasks/main.yml b/tests/integration/targets/meraki_action_batch/tasks/main.yml
deleted file mode 100644
index 768e1d251..000000000
--- a/tests/integration/targets/meraki_action_batch/tasks/main.yml
+++ /dev/null
@@ -1,325 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Query all Action Batches
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: query
-    delegate_to: localhost
-    register: query_all
-
-  - name: Query all Action Batches
-    ansible.builtin.set_fact:
-      batch_id: '{{ query_all.data[0].id }}'
-
-  - name: Asserting a values query_all.data and query_all
-    ansible.builtin.assert:
-      that:
-        - query_all.data is defined
-        - query_all is not changed
-
-  - name: Query one Action Batch job
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: query
-      action_batch_id: '{{ batch_id }}'
-    delegate_to: localhost
-    register: query_one
-
-  - name: Debug query_one
-    ansible.builtin.debug:
-      var: query_one | length
-
-  - name: Assert if query_one.data has been changed
-    ansible.builtin.assert:
-      that:
-        - query_one.data is defined
-
-  - name: Create an Action Batch job
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      actions:
-        - resource: '/organizations/{{ test_org_id }}/networks'
-          operation: 'create'
-          body:
-            name: 'AnsibleActionBatch1'
-            productTypes:
-              - 'switch'
-    delegate_to: localhost
-    register: create_one
-
-  - name: Assert a various values
-    ansible.builtin.assert:
-      that:
-        - create_one.data.id is defined
-        - create_one.data.status.completed == false
-        - create_one.data.actions.0.resource == '/organizations/{{ test_org_id }}/networks'
-        - create_one.data.actions.0.operation == 'create'
-        - create_one.data.actions.0.body.name == 'AnsibleActionBatch1'
-        - create_one.data.actions[0].body.product_types[0] == 'switch'
-
-  - name: Set fact new_batch_id
-    ansible.builtin.set_fact:
-      new_batch_id: '{{ create_one.data.id }}'
-
-  - name: Create an Action Batch job to be deleted later
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      actions:
-        - resource: '/organizations/{{ test_org_id }}/networks'
-          operation: 'create'
-          body:
-            name: 'AnsibleActionBatch100'
-            productTypes:
-              - 'switch'
-    delegate_to: localhost
-    register: batch_delete_id
-
-  - name: Set fact deletable_batch_id
-    ansible.builtin.set_fact:
-      deletable_batch_id: '{{ batch_delete_id.data.id }}'
-
-  - name: Update Action Batch job with a body
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      action_batch_id: '{{ new_batch_id }}'
-      actions:
-        - resource: '/organizations/{{ test_org_id }}/networks'
-          operation: 'create'
-          body:
-            name: 'AnsibleActionBatch1'
-            productTypes:
-              - 'switch'
-    delegate_to: localhost
-    register: create_one_idempotent
-    failed_when: false
-    changed_when: false
-
-  - name: Asset a value create_one_idempotent.msg
-    ansible.builtin.assert:
-      that:
-        - create_one_idempotent.msg == 'Body cannot be updated on existing job.'
-
-  - name: Update Action Batch job
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      action_batch_id: '{{ new_batch_id }}'
-      synchronous: false
-    delegate_to: localhost
-    register: update_one
-
-  - name: Assert a value update_one
-    ansible.builtin.assert:
-      that:
-        - update_one.data.id is defined
-        - update_one is changed
-
-  - name: Update Action Batch job with idempotentcy
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      action_batch_id: '{{ new_batch_id }}'
-      synchronous: false
-    delegate_to: localhost
-    register: update_one_idempotent
-
-  - name: Assert value update_one_idempotent
-    ansible.builtin.assert:
-      that:
-        - update_one_idempotent.data.id is defined
-        - update_one_idempotent is not changed
-
-  - name: Create an Action Batch job with multiple actions
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      actions:
-        - resource: '/organizations/{{ test_org_id }}/networks'
-          operation: 'create'
-          body:
-            name: 'AnsibleActionBatch2'
-            productTypes:
-              - 'switch'
-        - resource: '/organizations/{{ test_org_id }}/networks'
-          operation: 'create'
-          body:
-            name: 'AnsibleActionBatch3'
-            productTypes:
-              - 'switch'
-    delegate_to: localhost
-    register: create_two
-
-  - name: Set fact create_two_batch_id
-    ansible.builtin.set_fact:
-      create_two_batch_id: '{{ create_two.data.id }}'
-
-  - name: Set single action job as confirmed
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      action_batch_id: '{{ new_batch_id }}'
-      confirmed: true
-    delegate_to: localhost
-    register: confirm_one
-
-  - name: Assert confirm_one
-    ansible.builtin.assert:
-      that:
-        - confirm_one.data.id is defined
-        - confirm_one is changed
-
-  - name: Set two action job as confirmed
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      action_batch_id: '{{ create_two_batch_id }}'
-      confirmed: true
-    delegate_to: localhost
-    register: confirm_two
-
-  - name: Assert confirm_two
-    ansible.builtin.assert:
-      that:
-        - confirm_two.data.id is defined
-        - confirm_two is changed
-
-  - name: Gather newly created networks
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: query
-      action_batch_id: '{{ create_two_batch_id }}'
-    delegate_to: localhost
-    register: gather_networks
-
-  - name: If value is not equal Validation failed...
-    ansible.builtin.assert:
-      that:
-        - gather_networks.data.actions.0.status.errors.0 != 'Validation failed\: Name has already been taken'
-
-  - name: Set fact new_networks
-    ansible.builtin.set_fact:
-      new_networks: "{{ gather_networks.data.status.created_resources | selectattr('uri', 'defined') | map(attribute='uri') | list | unique }}"
-
-  - name: Initialize an empty list
-    ansible.builtin.set_fact:
-      delete_actions: []
-
-  - name: Set fact delete_actions
-    ansible.builtin.set_fact:
-      delete_actions: "{{ delete_actions + [{'resource': item, 'operation': 'destroy'}] }}"
-    loop: '{{ new_networks }}'
-
-  - name: Create an Action Batch job to delete newly created networks
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: present
-      actions: '{{ delete_actions }}'
-    delegate_to: localhost
-    register: delete_two
-
-  - name: Set fact deletable_bat
-    ansible.builtin.set_fact:
-      deletable_batch_id: '{{ delete_two.data.id }}'
-
-  - name: Delete an Action Batch job
-    meraki_action_batch:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: absent
-      action_batch_id: '{{ deletable_batch_id }}'
-      actions: '{{ delete_actions }}'
-    delegate_to: localhost
-    register: delete_two_networks
-
-  always:
-    - name: Get network ID for AnsibleActionBatch2
-      meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-        net_name: AnsibleActionBatch2
-      delegate_to: localhost
-      register: aab2
-
-    - name: Set value aab2_id
-      ansible.builtin.set_fact:
-        aab2_id: '{{ aab2.data.id }}'
-      failed_when: false
-      changed_when: false
-
-    - name: Get network ID for AnsibleActionBatch3
-      meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-        net_name: AnsibleActionBatch3
-      delegate_to: localhost
-      register: aab3
-
-    - name: Set value aab3_id
-      ansible.builtin.set_fact:
-        aab3_id: '{{ aab3.data.id }}'
-      failed_when: false
-      changed_when: false
-
-    - name: Delete new networks before other tests
-      meraki_action_batch:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        confirmed: true
-        actions:
-          - resource: '/networks/{{ aab2_id }}'
-            operation: 'destroy'
-          - resource: '/networks/{{ aab3_id }}'
-            operation: 'destroy'
-      delegate_to: localhost
-      register: delete_networks
-      when:
-        - aab2 is defined
-        - aab3 is defined
-
-  # - name: Get all action batch jobs
-  #   meraki_action_batch:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{ test_org_name }}'
-  #     state: query
-  #   delegate_to: localhost
-  #   register: all_jobs
-
-  # - ansible.builtin.debug:
-  #     var: all_jobs
-
-  # - name: Delete all action batch jobs
-  #   meraki_action_batch:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{ test_org_name }}'
-  #     state: absent
-  #     action_batch_id: '{{ item.id }}'
-  #   loop: '{{ all_jobs.data }}'
-  #   delegate_to: localhost
diff --git a/tests/integration/targets/meraki_admin/tasks/main.yml b/tests/integration/targets/meraki_admin/tasks/main.yml
deleted file mode 100644
index 89374c0b4..000000000
--- a/tests/integration/targets/meraki_admin/tasks/main.yml
+++ /dev/null
@@ -1,428 +0,0 @@
-# Test code for the Meraki Admin module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Create new administrator in check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jane Doe
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-      org_access: read-only
-    delegate_to: localhost
-    check_mode: true
-    register: create_org_check
-
-  - name: Create new admin check mode assertion
-    ansible.builtin.assert:
-      that:
-        - create_org_check is changed
-        - 'create_org_check.data.name == "Jane Doe"'
-
-  - name: Create new administrator
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jane Doe
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-      org_access: read-only
-    delegate_to: localhost
-    register: create_orgaccess
-
-  - name: Create new admin assertion
-    ansible.builtin.assert:
-      that:
-        - create_orgaccess.changed == true
-        - 'create_orgaccess.data.name == "Jane Doe"'
-
-  - name: Delete recently created administrator with check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-    delegate_to: localhost
-    register: delete_one_check
-    check_mode: true
-
-  - name: Assert if delete_one_check has been changed
-    ansible.builtin.assert:
-      that:
-        - delete_one_check is changed
-
-  - name: Delete recently created administrator
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-    delegate_to: localhost
-    register: delete_one
-
-  - name: Create new administrator with org_id
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      name: Jane Doe
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-      orgAccess: read-only
-    delegate_to: localhost
-    register: create_orgaccess_id
-
-  - name: Create new admin assertion
-    ansible.builtin.assert:
-      that:
-        - create_orgaccess_id.changed == true
-        - 'create_orgaccess_id.data.name == "Jane Doe"'
-
-  - name: Create administrator with tags with check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: John Doe
-      email: '{{ email_prefix }}+johndoe@{{ email_domain }}'
-      orgAccess: none
-      tags:
-        - tag: production
-          access: read-only
-        - tag: beta
-          access: full
-    delegate_to: localhost
-    register: create_tags_check
-    check_mode: true
-
-  - name: Assert if create_tags_check has been changed
-    ansible.builtin.assert:
-      that:
-        - create_tags_check is changed
-        - create_tags_check.data.name == "John Doe"
-        - create_tags_check.data.tags | length == 2
-
-  - name: Create administrator with tags
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: John Doe
-      email: '{{ email_prefix }}+johndoe@{{ email_domain }}'
-      orgAccess: none
-      tags:
-        - tag: production
-          access: read-only
-        - tag: beta
-          access: full
-    delegate_to: localhost
-    register: create_tags
-
-  - name: Assert if create_tags has been changed
-    ansible.builtin.assert:
-      that:
-        - create_tags.changed == true
-        - create_tags.data.name == "John Doe"
-        - create_tags.data.tags | length == 2
-
-  - name: Create administrator with invalid tags
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jake Doe
-      email: '{{ email_prefix }}+jakedoe@{{ email_domain }}'
-      orgAccess: none
-      tags:
-        - tag: production
-          access: read-only
-        - tag: alpha
-          access: invalid
-    delegate_to: localhost
-    register: create_tags_invalid
-    failed_when: false
-    changed_when: false
-
-  - name: Assert if create_tags_invalid
-    ansible.builtin.assert:
-      that:
-        - '"400" in create_tags_invalid.msg'
-        - '"must be one of" in create_tags_invalid.msg'
-
-  - name: Create administrator with invalid tag permission
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jake Doe
-      email: '{{ email_prefix }}+jakedoe@{{ email_domain }}'
-      orgAccess: none
-      tags:
-        - tag: production
-          access: read-only
-        - tag: beta
-          access: invalid
-    delegate_to: localhost
-    register: create_tags_invalid_permission
-    failed_when: false
-    changed_when: false
-
-  - name: Assert if create_tags_invalid_permission
-    ansible.builtin.assert:
-      that:
-        - '"400" in create_tags_invalid_permission.msg'
-        - '"must be one of" in create_tags_invalid_permission.msg'
-
-  - name: Make sure TestNet and TestNet2 are created
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ item }}'
-      type: switch
-    register: new_networks
-    loop:
-      - TestNet
-      - TestNet2
-
-  - name: Set facts testnet_id, testnet2_id
-    ansible.builtin.set_fact:
-      testnet_id: new_networks.results[0].data.id
-      testnet2_id: new_networks.results[1].data.id
-
-  - name: Create administrator with networks with check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: read-only
-        - id: testnet2_id
-          access: full
-    delegate_to: localhost
-    register: create_network_check
-    check_mode: true
-
-  - name: Assert if create_network_check has been changed
-    ansible.builtin.assert:
-      that:
-        - create_network_check is changed
-        - create_network_check.data.name == "Jim Doe"
-        - create_network_check.data.networks | length == 2
-
-  - name: Create administrator with networks
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: read-only
-        - network: TestNet2
-          access: full
-    delegate_to: localhost
-    register: create_network
-
-  - name: Assert if create_network has been changed
-    ansible.builtin.assert:
-      that:
-        - create_network.changed == true
-        - create_network.data.name == "Jim Doe"
-        - create_network.data.networks | length == 2
-
-  - name: Update administrator with check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: full
-    delegate_to: localhost
-    register: update_network_check
-    check_mode: true
-
-  - name: Debug update_network_check
-    ansible.builtin.debug:
-      var: update_network_check
-
-  - name: Assert if update_network_check has been changed
-    ansible.builtin.assert:
-      that:
-        - update_network_check is changed
-        - update_network_check.data.networks.0.access == "full"
-        - update_network_check.data.networks | length == 1
-
-  - name: Update administrator
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: full
-    delegate_to: localhost
-    register: update_network
-
-  - name: Assert if update_network has been changed
-    ansible.builtin.assert:
-      that:
-        - update_network.changed == true
-        - update_network.data.networks.0.access == "full"
-        - update_network.data.networks | length == 1
-
-  - name: Update administrator for idempotency check with check mode
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: full
-    delegate_to: localhost
-    register: update_network_idempotent_check
-    check_mode: true
-
-  - name: Debug update_network_idempotent_check
-    ansible.builtin.debug:
-      var: update_network_idempotent_check
-
-  - name: Assert if update_network_idempotent_check has not changed
-    ansible.builtin.assert:
-      that:
-        - update_network_idempotent_check is not changed
-
-  - name: Update administrator for idempotency
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: Jim Doe
-      email: '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNet
-          access: full
-    delegate_to: localhost
-    register: update_network_idempotent
-
-  - name: Assert if update_network_idempotent has been not changed
-    ansible.builtin.assert:
-      that:
-        - update_network_idempotent.changed == false
-        - update_network_idempotent.data is defined
-
-  - name: Create administrator with invalid network
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      name: John Doe
-      email: '{{ email_prefix }}+John@{{ email_domain }}'
-      orgAccess: none
-      networks:
-        - network: TestNetFake
-          access: read-only
-    delegate_to: localhost
-    register: create_network_invalid
-    failed_when: false
-    changed_when: false
-
-  - name: Assert if message in create_network_invalid
-    ansible.builtin.assert:
-      that:
-        - '"No network found with the name" in create_network_invalid.msg'
-        # - '"400" in create_network_invalid.msg'
-
-  - name: Query all administrators
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-    delegate_to: localhost
-    register: query_all
-
-  - name: Debug query_all
-    ansible.builtin.debug:
-      var: query_all
-
-  - name: Assert query_all
-    ansible.builtin.assert:
-      that:
-        - query_all.data | length == 4
-        - query_all.changed == False
-
-  - name: Query admin by name
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      name: Jane Doe
-    delegate_to: localhost
-    register: query_name
-
-  - name: Query admin by email
-    cisco.meraki.meraki_admin:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      email: '{{ email_prefix }}+janedoe@{{ email_domain }}'
-    delegate_to: localhost
-    register: query_email
-
-  - name: Check the name and email of query_name, query_email
-    ansible.builtin.assert:
-      that:
-        - query_name.data.name == "Jane Doe"
-        - 'query_email.data.email == "{{ email_prefix }}+janedoe@{{ email_domain }}"'
-
-  always:
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-    - name: Delete administrators
-      cisco.meraki.meraki_admin:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        email: '{{ item }}'
-      delegate_to: localhost
-      register: delete_all
-      failed_when: false
-      changed_when: false
-      loop:
-        - '{{ email_prefix }}+janedoe@{{ email_domain }}'
-        - '{{ email_prefix }}+johndoe@{{ email_domain }}'
-        - '{{ email_prefix }}+jimdoe@{{ email_domain }}'
-
-    - name: Query all administrators
-      cisco.meraki.meraki_admin:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-      delegate_to: localhost
-      register: query_all_deleted
-
-    - name: Assert query_all_deleted
-      ansible.builtin.assert:
-        that:
-          - query_all_deleted.data | length == 1
diff --git a/tests/integration/targets/meraki_alert/tasks/main.yml b/tests/integration/targets/meraki_alert/tasks/main.yml
deleted file mode 100644
index de9d20524..000000000
--- a/tests/integration/targets/meraki_alert/tasks/main.yml
+++ /dev/null
@@ -1,356 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2020, 2023 Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-    - name: Create network with type wireless
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        type: wireless
-        timezone: America/Chicago
-      delegate_to: localhost
-
-    - name: Create webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        name: Test webhook
-        url: "https://webhook.site/f113313e-fbad-464d-9fbe-ed2392e1ee8c"
-        shared_secret: "abc123"
-      delegate_to: localhost
-      register: webhook
-
-    - name: Update settings with check mode
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          emails:
-            - '{{ email_prefix }}@{{ email_domain }}'
-            - '{{ email_prefix }}2@{{ email_domain }}'
-          all_admins: false
-          snmp: false
-          http_server_ids:
-            - "aHR0cHM6Ly93ZWJob29rLnNpdGUvZjExMzMxM2UtZmJhZC00NjRkLTlmYmUtZWQyMzkyZTFlZThjCg=="
-        alerts:
-          - alert_type: "gatewayDown"
-            enabled: true
-            filters:
-              timeout: 60
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: false
-              snmp: false
-          - alert_type: "usageAlert"
-            enabled: true
-            filters:
-              period: 1200
-              threshold: 104857600
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: true
-              snmp: false
-      delegate_to: localhost
-      register: update_check
-      check_mode: true
-
-    - name: Assert update_check
-      ansible.builtin.assert:
-        that:
-          - update_check.data is defined
-          - update_check.diff is defined
-          - update_check is changed
-          - update_check.data.default_destinations.http_server_ids | length == 1
-
-    - name: Update settings
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          emails:
-            - '{{ email_prefix }}@{{ email_domain }}'
-            - '{{ email_prefix }}2@{{ email_domain }}'
-          all_admins: false
-          snmp: false
-        alerts:
-          - alert_type: "gatewayDown"
-            enabled: true
-            filters:
-              timeout: 60
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: false
-              snmp: false
-          - alert_type: "usageAlert"
-            enabled: true
-            filters:
-              period: 1200
-              threshold: 104857600
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: true
-              snmp: false
-      delegate_to: localhost
-      register: update
-
-    - name: Assert update
-      ansible.builtin.assert:
-        that:
-          - update.data is defined
-          - update.diff is defined
-          - update is changed
-          - update.data.default_destinations.emails | length == 2
-
-    - name: Update settings idempotent
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          emails:
-            - '{{ email_prefix }}@{{ email_domain }}'
-            - '{{ email_prefix }}2@{{ email_domain }}'
-          all_admins: false
-          snmp: false
-        alerts:
-          - alert_type: "gatewayDown"
-            enabled: true
-            filters:
-              timeout: 60
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: false
-              snmp: false
-          - alert_type: "usageAlert"
-            enabled: true
-            filters:
-              period: 1200
-              threshold: 104857600
-            alert_destinations:
-              emails:
-                - '{{ email_prefix }}@{{ email_domain }}'
-                - '{{ email_prefix }}2@{{ email_domain }}'
-              all_admins: true
-              snmp: false
-      delegate_to: localhost
-      register: update_idempotent
-
-    - name: Assert update_idempotent
-      ansible.builtin.assert:
-        that:
-          - update_idempotent.data is defined
-          - update_idempotent is not changed
-
-    - name: Remove Email from settings
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-          emails: []
-        alerts:
-          - alert_type: "gatewayDown"
-            enabled: true
-            filters:
-              timeout: 60
-            alert_destinations:
-              all_admins: false
-              snmp: false
-              emails: []
-          - alert_type: "usageAlert"
-            enabled: true
-            filters:
-              period: 1200
-              threshold: 104857600
-            alert_destinations:
-              all_admins: true
-              snmp: false
-      delegate_to: localhost
-      register: removeemailupdate
-
-    - name: Assert remove email update
-      ansible.builtin.assert:
-        that:
-          - removeemailupdate.data is defined
-          - removeemailupdate.diff is defined
-          - removeemailupdate is changed
-          - removemeailupdate.data.default_destinations.email is not defined
-
-    - name: Remove email settings idempotent
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-        alerts:
-          - alert_type: "gatewayDown"
-            enabled: true
-            filters:
-              timeout: 60
-            alert_destinations:
-              all_admins: false
-              snmp: false
-              emails: []
-          - alert_type: "usageAlert"
-            enabled: true
-            filters:
-              period: 1200
-              threshold: 104857600
-            alert_destinations:
-              all_admins: true
-              snmp: false
-      delegate_to: localhost
-      register: removeemailupdate_idempotent
-
-    - name: Remove Email Assert update_idempotent
-      ansible.builtin.assert:
-        that:
-          - removeemailupdate_idempotent.data is defined
-          - removeemailupdate_idempotent is not changed
-
-    - name: Set default destination email address and HTTP server ID
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-          emails:
-            - '{{ email_prefix }}@{{ email_domain }}'
-            - '{{ email_prefix }}2@{{ email_domain }}'
-          http_server_ids:
-            - '{{ webhook.data.id }}'
-      delegate_to: localhost
-      register: set_default_lists
-
-    - name: Assert default destination items
-      ansible.builtin.assert:
-        that:
-          - set_default_lists.data is defined
-          - set_default_lists is changed
-          - set_default_lists.data.default_destinations.emails | length == 2
-          - set_default_lists.data.default_destinations.http_server_ids| length == 1
-
-    - name: Update default destinations without HTTP server IDs for testing purposes
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-          emails:
-            - '{{ email_prefix }}@{{ email_domain }}'
-            - '{{ email_prefix }}2@{{ email_domain }}'
-      delegate_to: localhost
-
-    - name: Query all settings
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: query
-      delegate_to: localhost
-      register: query_for_webhook
-
-    - name: Check for HTTP server IDs
-      ansible.builtin.assert:
-        that:
-          - query_for_webhook.data.default_destinations.http_server_ids | length == 1
-
-    - name: Clear default destination email addresses
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-          emails:
-            -
-      delegate_to: localhost
-      register: clear_emails
-
-    - name: Assert emails were cleared
-      ansible.builtin.assert:
-        that:
-          - clear_emails.data.default_destinations.emails | length == 0
-
-    - name: Clear default destination HTTP server IDs
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: present
-        default_destinations:
-          all_admins: false
-          snmp: false
-          http_server_ids:
-            -
-      delegate_to: localhost
-      register: clear_http_ids
-
-    - name: Assert that HTTP servers were cleared
-      ansible.builtin.assert:
-        that:
-          - clear_http_ids.data.default_destinations.http_server_ids | length == 0
-
-    - name: Query all settings
-      cisco.meraki.meraki_alert:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        state: query
-      delegate_to: localhost
-      register: query_all
-
-    - name: Asset query_all
-      ansible.builtin.assert:
-        that:
-          - query_all.data is defined
-
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_config_template/tasks/main.yml b/tests/integration/targets/meraki_config_template/tasks/main.yml
deleted file mode 100644
index 9fd5b0dba..000000000
--- a/tests/integration/targets/meraki_config_template/tasks/main.yml
+++ /dev/null
@@ -1,210 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of test
-  block:
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Query all configuration templates
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-    register: get_all
-
-  - name: Delete non-existant configuration template
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      config_template: FakeConfigTemplate
-    register: deleted
-    failed_when: false
-    changed_when: false
-
-  - name: Assert a delated.msg
-    ansible.builtin.assert:
-      that:
-        - '"No configuration template named" in deleted.msg'
-
-  - name: Create a network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      type: appliance
-    delegate_to: localhost
-    register: net_info
-
-  - name: Set fact net_id
-    ansible.builtin.set_fact:
-      net_id: '{{ net_info.data.id }}'
-
-  - name: Bind a template to a network with check mode
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      config_template: '{{ test_template_name }}'
-    check_mode: true
-    register: bind_check
-
-  - name: Bind a template to a network
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      config_template: '{{ test_template_name }}'
-    register: bind
-
-  - name: Assert bind
-    ansible.builtin.assert:
-      that:
-        bind.changed == True
-
-  - name: Assert if bind_check has been changed
-    ansible.builtin.assert:
-      that:
-        bind_check is changed
-
-  - name: Bind a template to a network when it's already bound
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      config_template: '{{ test_template_name }}'
-    register: bind_invalid
-    failed_when: false
-    changed_when: false
-
-  - name: Assert if bind_invalid has been not changed
-    ansible.builtin.assert:
-      that:
-        - bind_invalid.changed == False
-
-  - name: Unbind a template from a network
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      config_template: '{{ test_template_name }}'
-    register: unbind
-
-  - name: Assert if unbind has been changed
-    ansible.builtin.assert:
-      that:
-        unbind.changed == True
-
-  - name: Unbind a template from a network when it's not bound
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      config_template: '{{ test_template_name }}'
-    register: unbind_invalid
-
-  - name: Assert if unbind_invalid has been not changed
-    ansible.builtin.assert:
-      that:
-        unbind_invalid.changed == False
-
-  - name: Bind a template to a network via id
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      config_template: '{{ test_template_name }}'
-    register: bind_id
-
-  - name: Assert if bind_id has been changed
-    ansible.builtin.assert:
-      that:
-        bind_id.changed == True
-
-  - name: Bind a template to a network via id for idempotency
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      config_template: '{{ test_template_name }}'
-    register: bind_id_idempotent
-
-  - name: Assert bind_id_idempotent
-    ansible.builtin.assert:
-      that:
-        - bind_id_idempotent.changed == False
-        - bind_id_idempotent.data is defined
-
-  - name: Unbind a template from a network via id with check mode
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      config_template: '{{ test_template_name }}'
-    check_mode: true
-    register: unbind_id_check
-
-  - name: Assert if unbind_id_check has been changed
-    ansible.builtin.assert:
-      that:
-        unbind_id_check is changed
-
-  - name: Unbind a template from a network via id
-    cisco.meraki.meraki_config_template:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      config_template: '{{ test_template_name }}'
-    register: unbind_id
-
-  - name: Assert if unbind_id_check has been changed
-    ansible.builtin.assert:
-      that:
-        unbind_id.changed == True
-
-  # This is disabled by default since they can't be created via API
-  # - name: Delete sacrificial template with check mode
-  #   cisco.meraki.meraki_config_template:
-  #     auth_key: '{{ auth_key }}'
-  #     state: absent
-  #     org_name: '{{ test_org_name }}'
-  #     config_template: sacrificial_template
-  #   check_mode: true
-  #   register: delete_template_check
-
-  # This is disabled by default since they can't be created via API
-  # - name: Delete sacrificial template
-  #   cisco.meraki.meraki_config_template:
-  #     auth_key: '{{ auth_key }}'
-  #     state: absent
-  #     org_name: '{{ test_org_name }}'
-  #     config_template: sacrificial_template
-  #     output_level: debug
-  #   register: delete_template
-
-  # - ansible.builtin.debug:
-  #     var: delete_template
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_device/tasks/main.yml b/tests/integration/targets/meraki_device/tasks/main.yml
deleted file mode 100644
index 17d5407c9..000000000
--- a/tests/integration/targets/meraki_device/tasks/main.yml
+++ /dev/null
@@ -1,265 +0,0 @@
----
-- name: Block of tests
-  block:
-  # This is commented out because a device cannot be unclaimed via API
-  # - name: Claim a device into an organization
-  #   cisco.meraki.meraki_device:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{ test_org_name }}'
-  #     serial: '{{ serial }}'
-  #     state: present
-  #   delegate_to: localhost
-  #   register: claim_device_org
-
-  # - ansible.builtin.assert:
-  #     that:
-  #       - claim_device_org.changed == true
-
-  - name: Create network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      type: appliance
-      state: present
-    register: net_info
-
-  - name: Set fact net_id
-    ansible.builtin.set_fact:
-      net_id: '{{ net_info.data.id }}'
-
-  - name: Query status of all devices in an organization
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      state: query
-    delegate_to: localhost
-    register: query_device_org
-
-  - name: Debug query_device_org
-    ansible.builtin.debug:
-      msg: '{{ query_device_org }}'
-
-  - name: Claim a device into a network
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      state: present
-    delegate_to: localhost
-    register: claim_device
-
-  - name: Debug claim_device
-    ansible.builtin.debug:
-      msg: '{{ claim_device }}'
-
-  - name: Assert if claim_device has been changed
-    ansible.builtin.assert:
-      that:
-        - claim_device.changed == true
-
-  - name: Query all devices in one network by network ID
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      state: query
-    delegate_to: localhost
-    register: query_one_net_id
-
-  - name: Debug query_one_net_id
-    ansible.builtin.debug:
-      msg: '{{ query_one_net_id }}'
-
-  - name: Query all devices in one network
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: query
-    delegate_to: localhost
-    register: query_one_net
-
-  - name: Debug query_one_net
-    ansible.builtin.debug:
-      msg: '{{ query_one_net }}'
-
-  - name: Query device by serial
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      serial: '{{ serial }}'
-      state: query
-    delegate_to: localhost
-    register: query_serial_no_net
-
-  - name: Debug query_serial_no_net
-    ansible.builtin.debug:
-      msg: '{{ query_serial_no_net }}'
-
-  - name: Query device by serial
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      state: query
-    delegate_to: localhost
-    register: query_serial
-
-  - name: Debug query_serial
-    ansible.builtin.debug:
-      msg: '{{ query_serial }}'
-
-  - name: Assert if query_serial has been not changed
-    ansible.builtin.assert:
-      that:
-        - query_serial.changed == False
-
-  - name: Query uplink information for a device
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      state: query
-      query: uplink
-    delegate_to: localhost
-    register: query_serial_uplink
-
-  - name: Debug query_serial_uplink
-    ansible.builtin.debug:
-      msg: '{{ query_serial_uplink }}'
-
-  - name: Query LLDP/CDP information about a device
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      lldp_cdp_timespan: 6000
-      state: query
-      query: lldp_cdp
-    delegate_to: localhost
-    register: query_serial_lldp_cdp
-
-  - name: Debug query_serial_lldp_cdp
-    ansible.builtin.debug:
-      msg: '{{ query_serial_lldp_cdp }}'
-
-  - name: Query a device by hostname
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      hostname: test-hostname
-      state: query
-    delegate_to: localhost
-    register: query_hostname
-
-  - name: Debug query_hostname
-    ansible.builtin.debug:
-      msg: '{{ query_hostname }}'
-
-  - name: Query a device by model
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      model: MR26
-      state: query
-    delegate_to: localhost
-    register: query_model
-
-  - name: Debug query_model
-    ansible.builtin.debug:
-      msg: '{{ query_model }}'
-
-  - name: Change device name for future test
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      hostname: mx60-temporary
-      address: 1060 W. Addison St., Chicago, IL
-      lat: 41.948038
-      lng: -87.65568
-      tags: recently-added
-      state: present
-      move_map_marker: true
-      note: Test device notes
-    delegate_to: localhost
-    register: update_device
-
-  - name: Update a device
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      hostname: mx60
-      address: 1060 W. Addison St., Chicago, IL
-      lat: 41.948038
-      lng: -87.65568
-      tags: recently-added
-      state: present
-      move_map_marker: true
-      note: Test device notes
-    delegate_to: localhost
-    register: update_device
-
-  - name: Assert update_device
-    ansible.builtin.assert:
-      that:
-        - update_device.changed == true
-        - update_device.data.0.notes == "Test device notes"
-        - '"1060 W. Addison St., Chicago, IL" in update_device.data.0.address'
-
-  - name: Update a device with idempotency
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      serial: '{{ serial }}'
-      name: mx60
-      address: 1060 W. Addison St., Chicago, IL
-      lat: 41.948038
-      lng: -87.65568
-      tags: recently-added
-      state: present
-      move_map_marker: true
-      note: Test device notes
-    delegate_to: localhost
-    register: update_device_idempotent
-
-  - name: Debug update_device_idempotent
-    ansible.builtin.debug:
-      msg: '{{ update_device_idempotent }}'
-
-  - name: Assert update_device_idempotent
-    ansible.builtin.assert:
-      that:
-        - update_device_idempotent.changed == False
-        - update_device_idempotent.data is defined
-
-  always:
-    - name: Remove a device from a network
-      cisco.meraki.meraki_device:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        serial: '{{ serial }}'
-        state: absent
-      delegate_to: localhost
-      register: delete_device
-
-    - name: Debug delete_device
-      ansible.builtin.debug:
-        msg: '{{ delete_device }}'
-
-    - name: Assert if delete_device has been changed
-      ansible.builtin.assert:
-        that:
-          - delete_device.changed == true
diff --git a/tests/integration/targets/meraki_firewalled_services/tasks/main.yml b/tests/integration/targets/meraki_firewalled_services/tasks/main.yml
deleted file mode 100644
index 60aa04a96..000000000
--- a/tests/integration/targets/meraki_firewalled_services/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki Firewalled Services module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
diff --git a/tests/integration/targets/meraki_firewalled_services/tasks/tests.yml b/tests/integration/targets/meraki_firewalled_services/tasks/tests.yml
deleted file mode 100644
index bcb329e3a..000000000
--- a/tests/integration/targets/meraki_firewalled_services/tasks/tests.yml
+++ /dev/null
@@ -1,234 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Create network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      type: appliance
-    register: create
-
-  - name: Set fact net_id
-    ansible.builtin.set_fact:
-      net_id: '{{ create.data.id }}'
-
-  - name: Set icmp service to blocked with check mode
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: ICMP
-      access: blocked
-    register: icmp_blocked_check
-    check_mode: true
-
-  - name: Debug icmp_blocked_check
-    ansible.builtin.debug:
-      var: icmp_blocked_check
-
-  - name: Assert if icmp_blocked_check has been changed
-    ansible.builtin.assert:
-      that:
-        - icmp_blocked_check.data is defined
-        - icmp_blocked_check is changed
-
-  - name: Set icmp service to blocked
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: ICMP
-      access: blocked
-    register: icmp_blocked
-
-  - name: Debug icmp_blocked
-    ansible.builtin.debug:
-      var: icmp_blocked
-
-  - name: Assert ig icmp_blocked has been changed
-    ansible.builtin.assert:
-      that:
-        - icmp_blocked.data is defined
-        - icmp_blocked is changed
-
-  - name: Set icmp service to blocked with idempotency
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: ICMP
-      access: blocked
-    register: icmp_blocked_idempotent
-
-  - name: Debug icmp_blocked_idempotent
-    ansible.builtin.debug:
-      var: icmp_blocked_idempotent
-
-  - name: Assert icmp_blocked_idempotent
-    ansible.builtin.assert:
-      that:
-        - icmp_blocked_idempotent.data is defined
-        - icmp_blocked_idempotent is not changed
-
-  - name: Set icmp service to restricted with check mode
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: web
-      access: restricted
-      allowed_ips:
-        - 192.0.1.1
-        - 192.0.1.2
-    check_mode: true
-    register: web_restricted_check
-
-  - name: Debug web_restricted_check
-    ansible.builtin.debug:
-      var: web_restricted_check
-
-  - name: Assert web_restricted_check
-    ansible.builtin.assert:
-      that:
-        - web_restricted_check.data is defined
-        - web_restricted_check is changed
-
-  - name: Set icmp service to restricted
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: web
-      access: restricted
-      allowed_ips:
-        - 192.0.1.1
-        - 192.0.1.2
-    register: web_restricted
-
-  - name: Debug web_restricted
-    ansible.builtin.debug:
-      var: web_restricted
-
-  - name: Assert web_restricted
-    ansible.builtin.assert:
-      that:
-        - web_restricted.data is defined
-        - web_restricted is changed
-
-  - name: Set icmp service to restricted with idempotency
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: web
-      access: restricted
-      allowed_ips:
-        - 192.0.1.1
-        - 192.0.1.2
-    register: web_restricted_idempotent
-
-  - name: Debug web_restricted_idempotent
-    ansible.builtin.debug:
-      var: web_restricted_idempotent
-
-  - name: Assert web_restricted_idempotent
-    ansible.builtin.assert:
-      that:
-        - web_restricted_idempotent.data is defined
-        - web_restricted_idempotent is not changed
-
-  - name: Test error for access restricted and allowed_ips
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: web
-      access: unrestricted
-      allowed_ips:
-        - 192.0.1.1
-        - 192.0.1.2
-    register: access_error
-    failed_when: false
-    changed_when: false
-
-  - name: Assert access_error
-    ansible.builtin.assert:
-      that:
-        - 'access_error.msg == "allowed_ips is only allowed when access is restricted."'
-
-  - name: Query appliance services with net_id
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-    register: query_appliance_id
-
-  - name: Debug query_appliance_id
-    ansible.builtin.debug:
-      var: query_appliance_id
-
-  - name: Assert query_appliance_id
-    ansible.builtin.assert:
-      that:
-        - query_appliance_id.data is defined
-
-
-  - name: Query appliance services
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-    register: query_appliance
-
-  - name: Debug query_appliance
-    ansible.builtin.debug:
-      var: query_appliance
-
-  - name: Assert query_appliance
-    ansible.builtin.assert:
-      that:
-        - query_appliance.data is defined
-
-  - name: Query services
-    cisco.meraki.meraki_firewalled_services:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      service: ICMP
-    register: query_service
-
-  - name: Debug query_service
-    ansible.builtin.debug:
-      var: query_service
-
-  - name: Assert query_service
-    ansible.builtin.assert:
-      that:
-        - query_service.data is defined
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-  always:
-    - name: Delete all networks
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkAppliance
diff --git a/tests/integration/targets/meraki_management_interface/tasks/main.yml b/tests/integration/targets/meraki_management_interface/tasks/main.yml
deleted file mode 100644
index 56c98e50f..000000000
--- a/tests/integration/targets/meraki_management_interface/tasks/main.yml
+++ /dev/null
@@ -1,298 +0,0 @@
-# Test code for the Meraki Management Interface module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Set fact net_name
-    ansible.builtin.set_fact:
-      net_name: TestNet - Appliance
-
-  - name: 'Create test network {{ net_name }}'
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_name: '{{ net_name }}'
-      type: appliance
-    delegate_to: localhost
-    register: net
-
-  - name: Set fact net_id
-    ansible.builtin.set_fact:
-      net_id: '{{ net.data.id }}'
-
-  - name: Test providing wan_enabled to an MS network
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ test_switch_net_name }}'
-      serial: '{{ serial_switch }}'
-      wan1:
-        wan_enabled: enabled
-        using_static_ip: false
-    delegate_to: localhost
-    register: ms_not_configured
-
-  - name: Debug ms_not_configured
-    ansible.builtin.debug:
-      var: ms_not_configured
-
-  - name: Assert ms_not_configured
-    ansible.builtin.assert:
-      that:
-        - ms_not_configured.data is defined
-
-  - name: Set management interface on switch
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ test_switch_net_name }}'
-      serial: '{{ serial_switch }}'
-      wan1:
-        using_static_ip: false
-        vlan: 3
-    delegate_to: localhost
-    register: set_switch_mgmt
-
-  - name: Debug set_switch_mgmt
-    ansible.builtin.debug:
-      var: set_switch_mgmt
-
-  - name: Assert set_switch_mgmt has been defined
-    ansible.builtin.assert:
-      that:
-        - set_switch_mgmt.data is defined
-
-  - name: Query non-MX network
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ test_switch_net_name }}'
-      serial: '{{ serial_switch }}'
-    delegate_to: localhost
-    register: non_mx_network
-
-  - name: Debug non_mx_network
-    ansible.builtin.debug:
-      var: non_mx_network
-
-  - name: Assert non_mx_network
-    ansible.builtin.assert:
-      that:
-        - non_mx_network.data is defined
-
-  - name: Reset management interface on switch
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ test_switch_net_name }}'
-      serial: '{{ serial_switch }}'
-      wan1:
-        using_static_ip: false
-        vlan: 1
-    delegate_to: localhost
-    register: reset_switch_mgmt
-
-  - name: Debug reset_switch_mgmt
-    ansible.builtin.debug:
-      var: reset_switch_mgmt
-
-  - name: Assert reset_switch_mgmt
-    ansible.builtin.assert:
-      that:
-        - reset_switch_mgmt.data is defined
-
-  - name: Set WAN1 as DHCP in check mode
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-      wan1:
-        wan_enabled: enabled
-        using_static_ip: false
-        vlan: 1
-    delegate_to: localhost
-    register: set_wan1_check
-    check_mode: true
-
-  - name: Debug set_wan1_check
-    ansible.builtin.debug:
-      var: set_wan1_check
-
-  - name: Assert set_wan1_check
-    ansible.builtin.assert:
-      that:
-        - set_wan1_check is changed
-        - set_wan1_check.data is defined
-
-  - name: Set WAN1 as DHCP
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-      wan1:
-        wan_enabled: enabled
-        using_static_ip: false
-        vlan: 1
-    delegate_to: localhost
-    register: set_wan1
-
-  - name: Debug set_wan1
-    ansible.builtin.debug:
-      var: set_wan1
-
-  - name: Assert set_wan1
-    ansible.builtin.assert:
-      that:
-        - set_wan1 is changed
-        - set_wan1.data is defined
-
-  - name: Set WAN1 as DHCP with idempotency
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-      wan1:
-        wan_enabled: enabled
-        using_static_ip: false
-        vlan: 1
-    delegate_to: localhost
-    register: set_wan1_idempotent
-
-  - name: Debug set_wan1_idempotent
-    ansible.builtin.debug:
-      var: set_wan1_idempotent
-
-  - name: Assert set_wan1_idempotent
-    ansible.builtin.assert:
-      that:
-        - set_wan1_idempotent is not changed
-        - set_wan1_idempotent.data is defined
-
-  - name: Set WAN2 as static IP
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-      wan2:
-        wan_enabled: enabled
-        using_static_ip: true
-        static_ip: 192.168.16.195
-        static_gateway_ip: 192.168.16.1
-        static_subnet_mask: 255.255.255.0
-        static_dns:
-          - 1.1.1.1
-        vlan: 1
-    delegate_to: localhost
-    register: set_wan2
-
-  - name: Debug set_wan2
-    ansible.builtin.debug:
-      var: set_wan2
-
-  - name: Assert set_wan2
-    ansible.builtin.assert:
-      that:
-        - set_wan2 is changed
-        - set_wan2.data is defined
-
-  - name: Test too many DNS servers
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{ test_org_id }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-      wan1:
-        wan_enabled: enabled
-        using_static_ip: true
-        static_ip: 192.0.1.2
-        static_gateway_ip: 192.0.1.1
-        static_subnet_mask: 255.255.255.0
-        static_dns:
-          - 1.1.1.1
-          - 8.8.8.8
-          - 4.4.4.4
-        vlan: 1
-    delegate_to: localhost
-    register: too_many_dns
-    failed_when: false
-    changed_when: false
-
-  - name: Debug too_many_dns
-    ansible.builtin.debug:
-      var: too_many_dns
-
-  - name: Assert too_many_dns
-    ansible.builtin.assert:
-      that:
-        - 'too_many_dns.msg == "Maximum number of static DNS addresses is 2."'
-
-  - name: Query management information
-    cisco.meraki.meraki_management_interface:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ serial }}'
-    delegate_to: localhost
-    register: query_mx
-
-  - name: Debug query_mx
-    ansible.builtin.debug:
-      var: query_mx
-
-  - name: Assert query_mx
-    ansible.builtin.assert:
-      that:
-        - query_mx.data is defined
-
-  always:
-  ############################################################################
-  # Tear down starts here
-  ############################################################################
-    - name: Reset settings for all interfaces
-      cisco.meraki.meraki_management_interface:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_id: '{{ test_org_id }}'
-        net_id: '{{ net_id }}'
-        serial: '{{ serial }}'
-        wan1:
-          wan_enabled: disabled
-          using_static_ip: false
-        wan2:
-          wan_enabled: enabled
-          using_static_ip: false
-      delegate_to: localhost
-      failed_when: false
-      changed_when: false
-
-  # Network deletion is commented out since this requires a device in a network
-  # - name: Delete network
-  #   cisco.meraki.meraki_network:
-  #     auth_key: '{{ auth_key }}'
-  #     state: absent
-  #     org_name: '{{ test_org_name }}'
-  #     net_name: '{{ net_name }}'
-  #   delegate_to: localhost
-  #   register: delete_network
diff --git a/tests/integration/targets/meraki_mr_l3_firewall/tasks/main.yml b/tests/integration/targets/meraki_mr_l3_firewall/tasks/main.yml
deleted file mode 100644
index 1390c2ecc..000000000
--- a/tests/integration/targets/meraki_mr_l3_firewall/tasks/main.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Create wireless network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetWireless
-      type: wireless
-    delegate_to: localhost
-    register: new_net
-
-  - name: Set fact new_net
-    ansible.builtin.set_fact:
-      net: '{{ new_net.data.id }}'
-
-  - name: Check rule values are lowercase
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetWireless
-      state: query
-      number: 0
-    delegate_to: localhost
-    register: query
-
-  - name: Debug query
-    ansible.builtin.debug:
-      var: query
-
-  - name: Assert query
-    ansible.builtin.assert:
-      that:
-        - query.data.rules.0.policy == 'deny'
-        - query.data.rules.0.protocol == 'any'
-        - query.data.rules.0.dest_port == 'any'
-        - query.data.rules.0.dest_cidr == 'local lan'
-        - query.data.rules.0.comment == 'Wireless clients accessing LAN'
-        - query.data.rules.1.policy == 'allow'
-        - query.data.rules.1.protocol == 'any'
-        - query.data.rules.1.dest_port == 'any'
-        - query.data.rules.1.dest_cidr == 'any'
-        - query.data.rules.1.comment == 'Default rule'
-
-  - name: Create single firewall rule with check mode
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-      rules:
-        - comment: Integration test rule
-          policy: allow
-          protocol: tcp
-          dest_port: 80
-          dest_cidr: 192.0.2.0/24
-      allow_lan_access: false
-    delegate_to: localhost
-    check_mode: true
-    register: create_one_check
-
-  - name: Debug create_one_check
-    ansible.builtin.debug:
-      msg: '{{ create_one_check }}'
-
-  - name: Assert create_one_check
-    ansible.builtin.assert:
-      that:
-        - create_one_check.data.0.comment == 'Integration test rule'
-        - create_one_check.data.1.policy == 'deny'
-        - create_one_check.data is defined
-        - create_one_check is changed
-
-  - name: Create single firewall rule
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-      rules:
-        - comment: Integration test rule
-          policy: allow
-          protocol: tcp
-          dest_port: 80
-          dest_cidr: 192.0.2.0/24
-      allow_lan_access: false
-    delegate_to: localhost
-    register: create_one
-
-  - name: Debug create_one
-    ansible.builtin.debug:
-      msg: '{{ create_one }}'
-
-  - name: Assert create_one
-    ansible.builtin.assert:
-      that:
-        - create_one.data.rules.0.comment == 'Integration test rule'
-        - create_one.data.rules.1.policy == 'deny'
-        - create_one.data is defined
-
-  - name: Enable local LAN access with check mode
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-      allow_lan_access: true
-    delegate_to: localhost
-    check_mode: true
-    register: enable_lan_check
-
-  - name: Debug enable_lan_check
-    ansible.builtin.debug:
-      var: enable_lan_check
-
-  - name: Assert enable_lan_check
-    ansible.builtin.assert:
-      that:
-        - enable_lan_check.data.rules.1.policy == 'allow'
-        - enable_lan_check is changed
-
-  - name: Enable local LAN access
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-      allow_lan_access: true
-    delegate_to: localhost
-    register: enable_lan
-
-  - name: Assert enable_lan
-    ansible.builtin.assert:
-      that:
-        - enable_lan.data.rules.1.policy == 'allow'
-
-  - name: Update rules without specifying LAN access with check mode
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-      rules:
-        - comment: Integration test rule
-          policy: allow
-          protocol: tcp
-          dest_port: 8080
-          dest_cidr: 192.0.2.0/24
-    delegate_to: localhost
-    register: update_one_check
-
-  - name: Debug update_one_check
-    ansible.builtin.debug:
-      msg: '{{ update_one_check }}'
-
-  - name: Assert update_one_check
-    ansible.builtin.assert:
-      that:
-        - update_one_check.data.rules.0.comment == 'Integration test rule'
-        - update_one_check.data is defined
-
-  - name: Query firewall rules
-    cisco.meraki.meraki_mr_l3_firewall:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      number: 1
-    delegate_to: localhost
-    register: query
-
-  - name: Debug query
-    ansible.builtin.debug:
-      msg: '{{ query }}'
-
-  - name: Assert query
-    ansible.builtin.assert:
-      that:
-        - query.data.rules.1.comment == 'Wireless clients accessing LAN'
-        - query.data.rules.2.comment == 'Default rule'
-        - query.changed == False
-
-############################################################################
-# Tear down starts here
-############################################################################
-  always:
-    - name: Delete wireless SSID
-      cisco.meraki.meraki_ssid:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net }}'
-        number: 1
-      delegate_to: localhost
-
-    - name: Delete wireless network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net }}'
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mr_l7_firewall/tasks/main.yml b/tests/integration/targets/meraki_mr_l7_firewall/tasks/main.yml
deleted file mode 100644
index 878b2a45b..000000000
--- a/tests/integration/targets/meraki_mr_l7_firewall/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki modules
-
-# Copyright: (c) 2022, Joshua Coronado (@joshuajcoronado) <joshua@coronado.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
diff --git a/tests/integration/targets/meraki_mr_l7_firewall/tasks/tests.yml b/tests/integration/targets/meraki_mr_l7_firewall/tasks/tests.yml
deleted file mode 100644
index 3cb74be6f..000000000
--- a/tests/integration/targets/meraki_mr_l7_firewall/tasks/tests.yml
+++ /dev/null
@@ -1,520 +0,0 @@
-# Test code for the Meraki modules
-
-# Copyright: (c) 2022, Joshua Coronado (@joshuajcoronado) <joshua@coronado.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Create network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: TestNet
-      state: present
-      type: wireless
-    register: new_net
-
-  - name: Query existing network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: TestNet
-      state: present
-      type: wireless
-    register: new_net
-
-  - name: Set fact new_net
-    ansible.builtin.set_fact:
-      net: '{{ new_net.data.id }}'
-
-  - name: Create wireless SSID
-    cisco.meraki.meraki_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      name: TestSSID
-
-  - name: Query firewall rules
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: query
-      ssid: TestSSID
-    register: query
-
-  - name: Assert query.data is defined
-    ansible.builtin.assert:
-      that:
-        - query.data is defined
-
-  - name: Query firewall application categories
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: query
-      categories: true
-    register: query_categories
-
-  - name: Assert query_categories.data is defined
-    ansible.builtin.assert:
-      that:
-        - query_categories.data is defined
-
-  - name: Set firewall rules to empty array
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      rules: []
-      ssid: TestSSID
-    register: empty_list
-
-  - name: Debug query
-    ansible.builtin.debug:
-      var: query
-
-  - name: Assert the rules are empty
-    ansible.builtin.assert:
-      that:
-        - empty_list.data.rules | length == 0
-
-  - name: Set firewall rules to empty array with idempotency
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      rules: []
-      ssid: TestSSID
-    register: empty_list_idempotent
-
-  - name: Debug empty_list_idempotent
-    ansible.builtin.debug:
-      var: empty_list_idempotent
-
-  - name: Assert rules list is still empty
-    ansible.builtin.assert:
-      that:
-        - empty_list_idempotent.data.rules | length == 0
-        - empty_list_idempotent is not changed
-
-  - name: Create firewall rule for IP range in check mode
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_check
-    check_mode: true
-
-  - name: Debug create_ip_range_check
-    ansible.builtin.debug:
-      var: create_ip_range_check
-
-  - name: Assert create_ip_range_check is changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_check is changed
-
-  - name: Create firewall rule for IP range
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range
-
-  - name: Debug create_ip_range
-    ansible.builtin.debug:
-      var: create_ip_range
-
-  - name: Assert firewalls rules have a single rule
-    ansible.builtin.assert:
-      that:
-        - create_ip_range is changed
-        - create_ip_range.data.rules | length == 1
-
-  - name: Create firewall rule for IP range with idempotency with check mode
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent_check
-    check_mode: true
-
-  - name: Assert create_ip_range_idempotent_check is not changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_idempotent_check is not changed
-
-  - name: Create firewall rule for IP range with idempotency
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent
-
-  - name: Assert create_ip_range_idempotent is not changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_idempotent is not changed
-
-  - name: Create firewall rule for IP and port
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.1:23
-    register: create_ip_range_port
-
-  - name: Debug create_ip_range_port
-    ansible.builtin.debug:
-      var: create_ip_range_port
-
-  - name: Assert create_ip_range_port is changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_port is changed
-
-  - name: Create firewall rule for IP range
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range
-
-  - name: Debug create_ip_range
-    ansible.builtin.debug:
-      var: create_ip_range
-
-  - name: Assert create_ip_range has changed and has a rule
-    ansible.builtin.assert:
-      that:
-        - create_ip_range is changed
-        - create_ip_range.data.rules | length == 1
-
-  - name: Create firewall rule for IP range with idempotency with check mode
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent_check
-    check_mode: true
-
-  - name: Assert create_ip_range_idempotent_check is not changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_idempotent_check is not changed
-
-  - name: Create firewall rule for IP range with idempotency
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent
-
-  - name: Assert create_ip_range_idempotent is not changed
-    ansible.builtin.assert:
-      that:
-        - create_ip_range_idempotent is not changed
-
-  - name: Create firewall rule for application
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: application
-          application:
-            name: facebook
-    register: application_rule
-
-  - name: Assert application_rule is changed
-    ansible.builtin.assert:
-      that:
-        - application_rule is changed
-        - application_rule.data.rules is defined
-
-  - name: Create firewall rule for application via ID
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: application
-          application:
-            id: meraki:layer7/application/205
-    register: application_rule_id
-
-  - name: Assert application_rule_id is changed
-    ansible.builtin.assert:
-      that:
-        - application_rule_id is changed
-
-  - name: Create firewall rule for invalid application
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: application
-          application:
-            name: ansible
-    register: application_rule_invalid
-    ignore_errors: true
-
-  - name: Create firewall rule for application category
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: application_category
-          application:
-            name: Advertising
-    register: application_category_rule
-
-  - name: Debug application_category_rule
-    ansible.builtin.debug:
-      var: application_category_rule
-
-  - name: Assert application_category_rule is changed
-    ansible.builtin.assert:
-      that:
-        - application_category_rule is changed
-
-  - name: Create firewall rule for application category with ID and conflict
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/27
-    register: application_category_rule_id_conflict
-
-  - name: Assert application_category_rule_id_conflict is not changed
-    ansible.builtin.assert:
-      that:
-        - application_category_rule_id_conflict is not changed
-
-  - name: Create firewall rule for application category with ID
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/24
-    register: application_category_rule_id
-
-  - name: Assert application_category_rule_id is changed
-    ansible.builtin.assert:
-      that:
-        - application_category_rule_id is changed
-
-  - name: Create firewall rule for host
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: host
-          host: asdf.com
-    register: host_rule
-
-  - name: Assert host_rule is changed
-    ansible.builtin.assert:
-      that:
-        - host_rule is changed
-
-  - name: Create firewall rule for port
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      ssid: TestSSID
-      rules:
-        - type: port
-          port: 1234
-    register: port_rule
-
-  - name: Assert port_rule is changed
-    ansible.builtin.assert:
-      that:
-        - port_rule is changed
-
-  - name: Create multiple firewall rules
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/27
-        - policy: deny
-          type: port
-          port: 8080
-    register: multiple_rules
-
-  - name: Debug multiple_rules
-    ansible.builtin.debug:
-      var: multiple_rules
-
-  - name: Assert multiple_rules.data.rules | length == 2
-    ansible.builtin.assert:
-      that:
-        - multiple_rules.data.rules | length == 2
-        - multiple_rules is changed
-
-  #########################################
-  ##  Tests for argument completeness    ##
-  #########################################
-
-  - name: Test application_category incomplete arguments
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: application_category
-    register: error_app_cat
-    ignore_errors: true
-
-  - name: Assert application argument is required when type is application_category
-    ansible.builtin.assert:
-      that:
-        - 'error_app_cat.msg == "application argument is required when type is application_category."'
-
-  - name: Test application incomplete arguments
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: application
-    register: error_app_cat
-    ignore_errors: true
-
-  - name: Assert application argument is required when type is application
-    ansible.builtin.assert:
-      that:
-        - 'error_app_cat.msg == "application argument is required when type is application."'
-
-  - name: Test host incomplete arguments
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: host
-    register: error_app_cat
-    ignore_errors: true
-
-  - name: Assert host argument is required when type is host
-    ansible.builtin.assert:
-      that:
-        - 'error_app_cat.msg == "host argument is required when type is host."'
-
-  - name: Test port incomplete arguments
-    cisco.meraki.meraki_mr_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      ssid: TestSSID
-      state: present
-      rules:
-        - type: port
-    register: error_app_cat
-    ignore_errors: true
-
-  - name: Assert port argument is required when type is port
-    ansible.builtin.assert:
-      that:
-        - 'error_app_cat.msg == "port argument is required when type is port."'
-
-############################################################################
-# Tear down starts here
-############################################################################
-  always:
-    - name: Delete wireless SSID
-      cisco.meraki.meraki_ssid:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net }}'
-        name: TestSSID
-
-    - name: Delete wireless network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net }}'
diff --git a/tests/integration/targets/meraki_mr_radio/tasks/main.yml b/tests/integration/targets/meraki_mr_radio/tasks/main.yml
deleted file mode 100644
index 987d099c4..000000000
--- a/tests/integration/targets/meraki_mr_radio/tasks/main.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2021, Tyler Christiansen (@supertylerc)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Create network with type wireless
-    cisco.meraki.meraki_network:
-      auth_key: "{{ auth_key }}"
-      state: present
-      org_name: "{{ test_org_name }}"
-      net_name: IntTestNetworkWireless
-      type: wireless
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: created_network
-
-  - name: Setting the net_id
-    ansible.builtin.set_fact:
-      created_net_id: '{{ created_network.data.id }}'
-
-  - name: Add access points to network
-    cisco.meraki.meraki_device:
-      auth_key: "{{ auth_key }}"
-      state: present
-      org_name: "{{ test_org_name }}"
-      net_id: '{{ created_net_id }}'
-      serial: "{{ serial_wireless }}"
-    delegate_to: localhost
-
-  - name: Create RF profile
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ test_org_name }}"
-      net_id: '{{ created_net_id }}'
-      state: present
-      name: Test Profile
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 40
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: create
-
-  - name: Set fact create
-    ansible.builtin.set_fact:
-      profile_id: "{{ create.data.id }}"
-
-  - name: Configure AP radios in check mode
-    cisco.meraki.meraki_mr_radio:
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ test_org_name }}"
-      net_id: '{{ created_net_id }}'
-      state: present
-      serial: "{{ serial_wireless }}"
-      five_ghz_settings:
-        channel: 40
-        channel_width: 20
-        target_power: 10
-      two_four_ghz_settings:
-        channel: 1
-        target_power: 10
-      rf_profile_name: Test Profile
-    delegate_to: localhost
-    register: create_check
-    check_mode: true
-
-  - name: Assert create_check
-    ansible.builtin.assert:
-      that:
-        - create_check.data is defined
-        - create_check is changed
-
-  - name: Query a device radio
-    cisco.meraki.meraki_mr_radio:
-      auth_key: '{{ auth_key }}'
-      serial: "{{ serial_wireless }}"
-      state: query
-    delegate_to: localhost
-    register: query_one
-
-  - name: Assert query_one
-    ansible.builtin.assert:
-      that:
-        - query_one.data is defined
-
-  - name: Configure AP radios
-    cisco.meraki.meraki_mr_radio:
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ test_org_name }}"
-      net_id: '{{ created_net_id }}'
-      state: present
-      serial: "{{ serial_wireless }}"
-      five_ghz_settings:
-        channel: 100
-        channel_width: 20
-        target_power: 10
-      two_four_ghz_settings:
-        channel: 1
-        target_power: 10
-      rf_profile_name: Test Profile
-    delegate_to: localhost
-    register: update
-
-  - name: Assert update
-    ansible.builtin.assert:
-      that:
-        - update.data is defined
-        - update is changed
-
-  - name: Configure AP radios
-    cisco.meraki.meraki_mr_radio:
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ test_org_name }}"
-      net_id: '{{ created_net_id }}'
-      state: present
-      serial: "{{ serial_wireless }}"
-      five_ghz_settings:
-        channel: 100
-        channel_width: 20
-        target_power: 10
-      two_four_ghz_settings:
-        channel: 1
-        target_power: 10
-      rf_profile_name: Test Profile
-    delegate_to: localhost
-    register: update_idempotent
-
-  - name: Assert update_idempotent
-    ansible.builtin.assert:
-      that:
-        - update_idempotent.data is defined
-        - update_idempotent is not changed
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ created_net_id }}'
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mr_rf_profile/tasks/main.yml b/tests/integration/targets/meraki_mr_rf_profile/tasks/main.yml
deleted file mode 100644
index ad5f9b6e2..000000000
--- a/tests/integration/targets/meraki_mr_rf_profile/tasks/main.yml
+++ /dev/null
@@ -1,342 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2020, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Create network with type wireless
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      type: wireless
-      timezone: America/Chicago
-    delegate_to: localhost
-
-  - name: Create RF profile in check mode
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      name: Test Profile
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 40
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: create_check
-    check_mode: true
-
-  - name: Assert create_check
-    ansible.builtin.assert:
-      that:
-        - create_check.data is defined
-        - create_check is changed
-
-  - name: Create RF profile
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      name: Test Profile
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 40
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: create
-
-  - name: Set fact profile_id
-    ansible.builtin.set_fact:
-      profile_id: '{{ create.data.id }}'
-
-  - name: Query all RF profiles
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: query
-    delegate_to: localhost
-    register: query_one
-
-  - name: Assert query_one
-    ansible.builtin.assert:
-      that:
-        - query_one.data is defined
-
-  - name: Update profile with check mode
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      profile_id: '{{ profile_id }}'
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -75
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: update_check
-    check_mode: true
-
-  - name: Assert update_check
-    ansible.builtin.assert:
-      that:
-        - update_check.data is defined
-        - update_check is changed
-
-  - name: Update profile
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      profile_id: '{{ profile_id }}'
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -75
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: update
-
-  - name: Assert update
-    ansible.builtin.assert:
-      that:
-        - update.data is defined
-        - update is changed
-
-  - name: Update profile with idempotency
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      profile_id: '{{ profile_id }}'
-      band_selection_type: ap
-      client_balancing_enabled: true
-      ap_band_settings:
-        mode: dual
-        band_steering_enabled: true
-      five_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -65
-        channel_width: 20
-        valid_auto_channels:
-          - 36
-          - 44
-      two_four_ghz_settings:
-        max_power: 10
-        min_bitrate: 12
-        min_power: 8
-        rxsop: -75
-        ax_enabled: false
-        valid_auto_channels:
-          - 1
-    delegate_to: localhost
-    register: update_idempotent
-
-  - name: Assert update_idempotent
-    ansible.builtin.assert:
-      that:
-        - update_idempotent.data is defined
-        - update_idempotent is not changed
-
-  - name: Query one RF profile by ID
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: query
-      profile_id: '{{ profile_id }}'
-    delegate_to: localhost
-    register: query_one_id
-
-  - name: Assert query_one_id
-    ansible.builtin.assert:
-      that:
-        - query_one_id.data is defined
-
-  - name: Query one RF profile by name
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: query
-      name: Test Profile
-    delegate_to: localhost
-    register: query_one_name
-
-  - name: Assert query_one_name
-    ansible.builtin.assert:
-      that:
-        - query_one_name.data is defined
-
-  - name: Delete RF profile
-    cisco.meraki.meraki_mr_rf_profile:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: absent
-      profile_id: '{{ profile_id }}'
-    delegate_to: localhost
-    register: delete
-
-  - name: Assert delete
-    ansible.builtin.assert:
-      that:
-        - delete.data is defined
-        - delete is changed
-
-- name: "Test RFProfile Bugfix from !281"
-  block:
-    - name: Create RF Profile
-      cisco.meraki.meraki_mr_rf_profile:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        name: "RF Profile - !281"
-        band_selection_type: ap
-        ap_band_settings:
-          mode: 'dual'
-        five_ghz_settings:
-          channel_width: 40
-        two_four_ghz_settings:
-          ax_enabled: 'no'
-        state: present
-      register: create_281
-
-    - name: Assert create_281
-      ansible.builtin.assert:
-        that:
-          - create_281.data is defined
-          - create_281 is changed
-
-    - name: Create RF Profile - Idempotent
-      cisco.meraki.meraki_mr_rf_profile:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        name: "RF Profile - !281"
-        band_selection_type: ap
-        ap_band_settings:
-          mode: 'dual'
-        five_ghz_settings:
-          channel_width: 40
-        two_four_ghz_settings:
-          ax_enabled: 'no'
-        state: present
-      register: idempotent_281
-
-    - name: Assert idempotent_281
-      ansible.builtin.assert:
-        that:
-          - idempotent_281.data is defined
-          - idempotent_281 is not changed
-
-    - name: Clean Up RF Profile
-      cisco.meraki.meraki_mr_rf_profile:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-        name: "RF Profile - !281"
-        state: absent
-      register: delete_281
-
-    - name: Assert delete_281
-      ansible.builtin.assert:
-        that:
-          - delete_281.data is defined
-          - delete_281 is changed
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mr_settings/tasks/main.yml b/tests/integration/targets/meraki_mr_settings/tasks/main.yml
deleted file mode 100644
index 3010d421f..000000000
--- a/tests/integration/targets/meraki_mr_settings/tasks/main.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2020, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Create network with type wireless
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      type: wireless
-      timezone: America/Chicago
-    delegate_to: localhost
-
-  - name: Query all settings
-    cisco.meraki.meraki_mr_settings:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: query
-    delegate_to: localhost
-    register: query_all
-
-  - name: Debug query_all
-    ansible.builtin.debug:
-      var: query_all
-
-  - name: Assert query_all.data
-    ansible.builtin.assert:
-      that:
-        - query_all.data is defined
-
-  - name: Configure settings with check mode
-    cisco.meraki.meraki_mr_settings:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      upgrade_strategy: minimize_upgrade_time
-      ipv6_bridge_enabled: false
-      led_lights_on: true
-      location_analytics_enabled: true
-      meshing_enabled: true
-    delegate_to: localhost
-    register: settings_check
-    check_mode: true
-
-  - name: Assert settings_check
-    ansible.builtin.assert:
-      that:
-        - settings_check.data is defined
-        - settings_check is changed
-
-  - name: Configure settings
-    cisco.meraki.meraki_mr_settings:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      upgrade_strategy: minimize_upgrade_time
-      ipv6_bridge_enabled: false
-      led_lights_on: true
-      location_analytics_enabled: true
-      meshing_enabled: true
-    delegate_to: localhost
-    register: settings
-
-  - name: Assert settings.data
-    ansible.builtin.assert:
-      that:
-        - settings.data is defined
-        - settings is changed
-
-  - name: Configure settings with idempotency
-    cisco.meraki.meraki_mr_settings:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkWireless
-      state: present
-      upgrade_strategy: minimize_upgrade_time
-      ipv6_bridge_enabled: false
-      led_lights_on: true
-      location_analytics_enabled: true
-      meshing_enabled: true
-    delegate_to: localhost
-    register: settings_idempotent
-
-  - name: Assert settings_idempotent
-    ansible.builtin.assert:
-      that:
-        - settings_idempotent.data is defined
-        - settings_idempotent is not changed
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: IntTestNetworkWireless
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_access_list/tasks/main.yml b/tests/integration/targets/meraki_ms_access_list/tasks/main.yml
deleted file mode 100644
index f671fc928..000000000
--- a/tests/integration/targets/meraki_ms_access_list/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki Webhooks module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
diff --git a/tests/integration/targets/meraki_ms_access_list/tasks/tests.yml b/tests/integration/targets/meraki_ms_access_list/tasks/tests.yml
deleted file mode 100644
index 8c92d9c11..000000000
--- a/tests/integration/targets/meraki_ms_access_list/tasks/tests.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-# Test code for the Meraki Webhook module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create test network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      type: switch
-
-  - name: Set access list in check mode
-    meraki_switch_access_list:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      rules:
-        - comment: Fake rule
-          policy: allow
-          ip_version: ipv4
-          protocol: udp
-          src_cidr: 192.0.1.0/24
-          src_port: "4242"
-          dst_cidr: 1.2.3.4/32
-          dst_port: "80"
-          vlan: "100"
-    register: create_check
-    check_mode: true
-
-  - name: Assert create_check
-    ansible.builtin.assert:
-      that:
-        - create_check is changed
-        - create_check.data is defined
-
-  - name: Debug create_check
-    ansible.builtin.debug:
-      var: create_check
-
-  - name: Set access list
-    meraki_switch_access_list:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      rules:
-        - comment: Fake rule
-          policy: allow
-          ip_version: ipv4
-          protocol: udp
-          src_cidr: 192.0.1.0/24
-          src_port: "4242"
-          dst_cidr: 1.2.3.4/32
-          dst_port: "80"
-          vlan: "100"
-    register: create
-
-  - name: Assert create
-    ansible.builtin.assert:
-      that:
-        - create is changed
-        - create.data is defined
-
-  - name: Debug create
-    ansible.builtin.debug:
-      var: create
-
-  - name: Set access list with idempotency
-    meraki_switch_access_list:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      rules:
-        - comment: Fake rule
-          policy: allow
-          ip_version: ipv4
-          protocol: udp
-          src_cidr: 192.0.1.0/24
-          src_port: 4242
-          dst_cidr: 1.2.3.4/32
-          dst_port: 80
-          vlan: 100
-    register: create_idempotent
-
-  - name: Debug create_idempotent
-    ansible.builtin.debug:
-      var: create_idempotent
-
-  - name: Assert create_idempotent
-    ansible.builtin.assert:
-      that:
-        - create_idempotent is not changed
-        - create_idempotent.data is defined
-
-  - name: Query access lists
-    meraki_switch_access_list:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-    register: query
-
-  - name: Debug query
-    ansible.builtin.debug:
-      var: query
-
-  - name: Assert query
-    ansible.builtin.assert:
-      that:
-        - query.data is defined
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-  always:
-    - name: Delete test network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
diff --git a/tests/integration/targets/meraki_ms_access_policies/tasks/main.yml b/tests/integration/targets/meraki_ms_access_policies/tasks/main.yml
deleted file mode 100644
index 9ba1d64dc..000000000
--- a/tests/integration/targets/meraki_ms_access_policies/tasks/main.yml
+++ /dev/null
@@ -1,561 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2022, Marcin Woźniak (@y0rune) <y0rune@aol.com>
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Test an API key is provided
-  ansible.builtin.fail:
-    msg: Please define an API key
-  when: auth_key is not defined
-
-- name: Testing - created "Meraki authentication"
-  block:
-    - name: Query all access polices
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: query_all
-
-    - name: Create access policy with auth_method is "Meraki authentication"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        auth_method: "Meraki authentication"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: create_access_policy
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right name of policy
-      ansible.builtin.assert:
-        that:
-          - create_access_policy is changed
-          - query_one.data.name == "Meraki authentication policy"
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "Meraki authentication" with guest_vlan
-  block:
-    - name: Create access policy with auth_method is "Meraki authentication" with guest_vlan
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        auth_method: "Meraki authentication"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        guest_vlan: 10
-      delegate_to: localhost
-      register: create_access_policy_guest_vlan
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right guest_vlan
-      ansible.builtin.assert:
-        that:
-          - query_one.data.guest_vlan_id == 10
-          - create_access_policy_guest_vlan is changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "my RADIUS Server" and updated the same policy
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Meraki authentication policy"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server
-
-    - name: Update the same access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Meraki authentication policy"
-        number: 1
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: update_access_policy_my_radius_server
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right host in radius_server
-      ansible.builtin.assert:
-        that:
-          - query_one.data.radius_servers.0.host == '192.0.1.18'
-          - query_one.data.guest_vlan_id == 10
-          - create_access_policy_my_radius_server is changed
-          - update_access_policy_my_radius_server is not changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "my RADIUS Server" with accounting
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server" with accounting
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        host_mode: "Single-Host"
-        access_policy_type: "802.1x"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: true
-        radius_accounting_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server_accounting
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right host in accounting servers
-      ansible.builtin.assert:
-        that:
-          - query_one.data.radius_accounting_servers.0.host == '192.0.1.18'
-          - create_access_policy_my_radius_server_accounting is changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "my RADIUS Server" with accounting and removed accounting
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server" with accounting
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        host_mode: "Single-Host"
-        access_policy_type: "802.1x"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: true
-        radius_accounting_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server_accounting
-
-    - name: Update access policy with auth_method is "my RADIUS Server" with accounting
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        number: 1
-        name: "Updated Meraki authentication policy"
-        host_mode: "Single-Host"
-        access_policy_type: "802.1x"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.20
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: update_access_policy_my_radius_server_accounting
-
-    - name: Query one access policy when was updated
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right host in accounting servers
-      ansible.builtin.assert:
-        that:
-          - query_one.data.radius_servers.0.host == '192.0.1.20'
-          - update_access_policy_my_radius_server_accounting is changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "my RADIUS Server" and added accounting
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Meraki authentication policy"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server
-
-    - name: Update access policy with auth_method is "my RADIUS Server" with accounting
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        host_mode: "Single-Host"
-        access_policy_type: "802.1x"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: true
-        radius_accounting_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: update_access_policy_my_radius_server_accounting
-
-    - name: Query one access policy when was updated
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right host in accounting servers
-      ansible.builtin.assert:
-        that:
-          - query_one.data.radius_servers.0.host == '192.0.1.18'
-          - query_one.data.radius_accounting_servers.0.host == '192.0.1.18'
-          - update_access_policy_my_radius_server_accounting is changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "my RADIUS Server" with accounting and removed accounting
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server" with accounting
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Meraki authentication policy"
-        host_mode: "Single-Host"
-        access_policy_type: "802.1x"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: true
-        radius_accounting_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server_accounting
-
-    - name: Update access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Meraki authentication policy"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: update_access_policy_my_radius_server
-
-    - name: Query one access policy when was updated
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right host in accounting servers
-      ansible.builtin.assert:
-        that:
-          - query_one.data.radius_servers.0.host == '192.0.1.18'
-          - update_access_policy_my_radius_server is changed
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "Meraki authentication" and changed it into "my RADIUS Server"
-  block:
-    - name: Create access policy with auth_method is "Meraki authentication"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: present
-        name: "Authentication policy"
-        auth_method: "Meraki authentication"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: create_access_policy
-
-    - name: Update access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Authentication policy"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-      delegate_to: localhost
-      register: update_access_policy_my_radius_server
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right name of policy
-      ansible.builtin.assert:
-        that:
-          - update_access_policy_my_radius_server is changed
-          - query_one.data.radius_servers.0.host == '192.0.1.18'
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
-
-- name: Testing - created "Meraki authentication" with RADIUS attribute specyfing group policy
-  block:
-    - name: Create access policy with auth_method is "my RADIUS Server"
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        access_policy_type: "802.1x"
-        host_mode: "Single-Host"
-        state: present
-        name: "Authentication policy"
-        auth_method: "my RADIUS server"
-        radius_servers:
-          - host: 192.0.1.18
-            port: 7890
-            secret: secret123
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        radius_coa_enabled: false
-        radius_accounting_enabled: false
-        guest_vlan: 10
-        voice_vlan_clients: false
-        radius_attribute_group_policy_name: "Filter-Id"
-      delegate_to: localhost
-      register: create_access_policy_my_radius_server
-
-    - name: Query one access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        number: 1
-      delegate_to: localhost
-      register: query_one
-
-    - name: Checking if the query one access policy returns right name of policy
-      ansible.builtin.assert:
-        that:
-          - create_access_policy_my_radius_server is changed
-          - query_one.data.radius_group_attribute == '11'
-
-  always:
-    - name: Delete access policy
-      cisco.meraki.meraki_ms_access_policies:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        number: 1
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-      delegate_to: localhost
-      register: delete_access_policy
diff --git a/tests/integration/targets/meraki_ms_l3_interface/tasks/main.yml b/tests/integration/targets/meraki_ms_l3_interface/tasks/main.yml
deleted file mode 100644
index b32135cd1..000000000
--- a/tests/integration/targets/meraki_ms_l3_interface/tasks/main.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create network with type switch
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch
-
-  - name: Claim a device into a network
-    meraki_device:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-      serial: '{{ serial_switch_l3 }}'
-      state: present
-    delegate_to: localhost
-
-  - name: Query all l3 interfaces
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: query
-      serial: '{{ serial_switch_l3 }}'
-    delegate_to: localhost
-    register: query_all
-
-  - set_fact:
-      interface_id_1: '{{query_all.data.1.interface_id}}'
-    ignore_errors: true
-
-  - assert:
-      that:
-        - query_all.data is defined
-        - query_all.data | length > 0
-
-  - name: Query one l3 interface
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: query
-      serial: '{{ serial_switch_l3 }}'
-      name: Test L3 interface
-    delegate_to: localhost
-    register: query_one
-
-  - assert:
-      that:
-        - query_one.data is defined
-
-  - name: Create l3 interface in check mode
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      # default_gateway: "192.168.2.1"
-      ospf_settings:
-        area: 0
-        cost: 1
-        is_passive_enabled: true
-    delegate_to: localhost
-    check_mode: true
-    register: create_check
-
-  - assert:
-      that:
-        - create_check.data is defined
-        - create_check is changed
-
-  - name: Create l3 interface
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      # default_gateway: "192.168.2.1"
-      ospf_settings:
-        area: 0
-        cost: 1
-        is_passive_enabled: true
-    delegate_to: localhost
-    register: create
-
-  - set_fact:
-      interface_id_1: '{{create.data.interface_id}}'
-
-  - assert:
-      that:
-        - create.data is defined
-        - create is changed
-
-  - name: Update l3 interface with check mode
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      ospf_settings:
-        area: 0
-        cost: 2
-        is_passive_enabled: false
-    delegate_to: localhost
-    register: update_check
-    check_mode: true
-
-  - assert:
-      that:
-        - update_check.data is defined
-        - update_check is changed
-
-  - name: Update l3 interface
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      ospf_settings:
-        area: 0
-        cost: 2
-        is_passive_enabled: false
-    delegate_to: localhost
-    register: update
-
-  - assert:
-      that:
-        - update.data is defined
-        - update is changed
-
-  - name: Update l3 interface idempotent
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      ospf_settings:
-        area: 0
-        cost: 2
-        is_passive_enabled: false
-    delegate_to: localhost
-    register: update_idempotent
-
-  - assert:
-      that:
-        update_idempotent is not changed
-
-  - name: Update l3 interface idempotent with check mode
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      serial: '{{ serial_switch_l3 }}'
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-      ospf_settings:
-        area: 0
-        cost: 2
-        is_passive_enabled: false
-    delegate_to: localhost
-    register: update_idempotent_check
-    check_mode: true
-
-  - assert:
-      that:
-        update_idempotent_check is not changed
-
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-  - name: Delete l3 interface with check mode
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      serial: '{{ serial_switch_l3 }}'
-      interface_id: '{{ item }}'
-    delegate_to: localhost
-    check_mode: true
-    register: delete_check
-    loop:
-      - '{{interface_id_1}}'
-
-  - assert:
-      that:
-        - delete_check is changed
-
-  - name: Delete l3 interface
-    meraki_ms_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      serial: '{{ serial_switch_l3 }}'
-      interface_id: '{{ interface_id_1 }}'
-    delegate_to: localhost
-    register: delete
-
-  - assert:
-      that:
-        - delete is changed
-
-  # - name: Delete network
-  #   meraki_network:
-  #     auth_key: '{{ auth_key }}'
-  #     state: absent
-  #     org_name: '{{test_org_name}}'
-  #     net_name: IntTestNetworkSwitch
-  #   delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_link_aggregation/tasks/main.yml b/tests/integration/targets/meraki_ms_link_aggregation/tasks/main.yml
deleted file mode 100644
index 848f57b40..000000000
--- a/tests/integration/targets/meraki_ms_link_aggregation/tasks/main.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Test code for the Meraki MS Link Aggregation module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create test network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        type: switch
-      register: test_net
-
-    - name: Add device to network
-      cisco.meraki.meraki_device:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        serial: "{{ serial_switch }}"
-      delegate_to: localhost
-
-    - name: Create LAG
-      cisco.meraki.meraki_ms_link_aggregation:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        switch_ports:
-          - serial: "{{ serial_switch }}"
-            port_id: "1"
-          - serial: "{{ serial_switch }}"
-            port_id: "2"
-      delegate_to: localhost
-      register: create_ports
-
-    - name: Debug create_ports
-      ansible.builtin.debug:
-        var: create_ports
-
-    - name: Set fact create_ports
-      ansible.builtin.set_fact:
-        lag_id: "{{ create_ports.data.id }}"
-
-    - name: Update LAG
-      cisco.meraki.meraki_ms_link_aggregation:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        lag_id: "{{ lag_id }}"
-        switch_ports:
-          - serial: "{{ serial_switch }}"
-            port_id: "1"
-          - serial: "{{ serial_switch }}"
-            port_id: "2"
-          - serial: "{{ serial_switch }}"
-            port_id: "3"
-          - serial: "{{ serial_switch }}"
-            port_id: "4"
-      delegate_to: localhost
-      register: update_ports
-
-    - name: Assert update_ports
-      ansible.builtin.assert:
-        that:
-          - update_ports is changed
-
-    - name: Update LAG with idempotency
-      cisco.meraki.meraki_ms_link_aggregation:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        lag_id: "{{ lag_id }}"
-        switch_ports:
-          - serial: "{{ serial_switch }}"
-            port_id: "1"
-          - serial: "{{ serial_switch }}"
-            port_id: "2"
-          - serial: "{{ serial_switch }}"
-            port_id: "3"
-          - serial: "{{ serial_switch }}"
-            port_id: "4"
-      delegate_to: localhost
-      register: update_ports_idempotent
-
-    - name: Assert update_ports_idempotent
-      ansible.builtin.assert:
-        that:
-          - update_ports_idempotent is not changed
-
-    - name: Query all LAGs
-      cisco.meraki.meraki_ms_link_aggregation:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-      delegate_to: localhost
-      register: query_all
-
-    - name: Debug query_all
-      ansible.builtin.debug:
-        var: query_all
-
-  always:
-    - name: Delete LAG
-      cisco.meraki.meraki_ms_link_aggregation:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_switch_net_name }}"
-        lag_id: "{{ lag_id }}"
-      delegate_to: localhost
-
-    # - name: Delete test network
-    #   meraki_network:
-    #     auth_key: '{{ auth_key }}'
-    #     state: absent
-    #     org_name: '{{ test_org_name }}'
-    #     net_name: '{{ test_switch_net_name }}'
-    #   register: delete_net
diff --git a/tests/integration/targets/meraki_ms_ospf/tasks/main.yml b/tests/integration/targets/meraki_ms_ospf/tasks/main.yml
deleted file mode 100644
index f7b0f92b5..000000000
--- a/tests/integration/targets/meraki_ms_ospf/tasks/main.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-    - name: Create network with type switch
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        type: switch
-        timezone: America/Chicago
-      delegate_to: localhost
-      register: create_net_switch
-
-    - name: Claim a device into a network
-      cisco.meraki.meraki_device:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        serial: "{{ serial_switch_l3 }}"
-        state: present
-      delegate_to: localhost
-
-    - name: Query OSPF settings
-      cisco.meraki.meraki_ms_ospf:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        state: query
-      delegate_to: localhost
-      register: query_all
-
-    - name: Assert query_all
-      ansible.builtin.assert:
-        that:
-          - query_all.data is defined
-
-    - name: Enable OSPF with check mode
-      cisco.meraki.meraki_ms_ospf:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        state: present
-        enabled: true
-        hello_timer: 20
-        dead_timer: 60
-        areas:
-          - area_id: 0
-            area_name: Backbone
-            area_type: normal
-          - area_id: 1
-            area_name: Office
-            area_type: nssa
-        md5_authentication_enabled: true
-        md5_authentication_key:
-          id: 1
-          passphrase: "secretpass"
-      check_mode: true
-      register: enable_check_mode
-
-    - name: Assert enable_check_mode
-      ansible.builtin.assert:
-        that:
-          - enable_check_mode.data is defined
-
-    - name: Enable OSPF
-      cisco.meraki.meraki_ms_ospf:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        state: present
-        enabled: true
-        hello_timer: 20
-        dead_timer: 60
-        areas:
-          - area_id: 0
-            area_name: Backbone
-            area_type: normal
-          - area_id: 1
-            area_name: Office
-            area_type: nssa
-        md5_authentication_enabled: true
-        md5_authentication_key:
-          id: 1
-          passphrase: "secretpass"
-      register: enable
-
-    - name: Assert enable
-      ansible.builtin.assert:
-        that:
-          - enable.data is defined
-
-    - name: Enable OSPF with idempotency
-      cisco.meraki.meraki_ms_ospf:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-        state: present
-        enabled: true
-        hello_timer: 20
-        dead_timer: 60
-        areas:
-          - area_id: 0
-            area_name: Backbone
-            area_type: normal
-          - area_id: 1
-            area_name: Office
-            area_type: nssa
-        md5_authentication_enabled: true
-        md5_authentication_key:
-          id: 1
-          passphrase: "secretpass"
-      delegate_to: localhost
-      register: enable_ospf_idempotent
-
-    - name: Debug enable_ospf_idempotent
-      ansible.builtin.debug:
-        var: enable_ospf_idempotent
-
-    - name: Assert enable_ospf_idempotent
-      ansible.builtin.assert:
-        that:
-          - enable_ospf_idempotent is not changed
-          - enable_ospf_idempotent.data is defined
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        net_name: IntTestNetworkSwitch
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_stack/tasks/main.yml b/tests/integration/targets/meraki_ms_stack/tasks/main.yml
deleted file mode 100644
index 7362d39c9..000000000
--- a/tests/integration/targets/meraki_ms_stack/tasks/main.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-# Test code for the Meraki Switch Stack module
-# Copyright: (c) 2020, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Create network with type switch
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch
-
-  - name: Set fact create_net_switch
-    ansible.builtin.set_fact:
-      net_id: '{{ create_net_switch.data.id }}'
-
-  - name: Claim devices into network
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net_id }}'
-      serial: '{{ item }}'
-      state: present
-    delegate_to: localhost
-    register: claim_device
-    loop:
-      - "QBSB-BPR6-PRER"
-      - "QBSB-VLNE-E299"
-      - "QBSB-D75G-PXCG"
-
-  - name: Create new stack
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      name: Test stack
-      serials:
-        - "QBSB-BPR6-PRER"
-        - "QBSB-VLNE-E299"
-    register: create
-
-  - name: Debug create
-    ansible.builtin.debug:
-      var: create
-
-  - name: Set fact create
-    ansible.builtin.set_fact:
-      stack_id: '{{ create.data.id }}'
-
-  - name: Assert create
-    ansible.builtin.assert:
-      that:
-        - create.data is defined
-        - create is changed
-
-  - name: Add switch to stack
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      stack_id: '{{ stack_id }}'
-      serials:
-        - "QBSB-D75G-PXCG"
-    register: add_stack
-
-  - name: Assert add_stack
-    ansible.builtin.assert:
-      that:
-        - add_stack.data is defined
-        - add_stack.data.serials | length == 3
-        - add_stack is changed
-
-  - name: Add switch to stack idempotent
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      stack_id: '{{ stack_id }}'
-      serials:
-        - "QBSB-D75G-PXCG"
-    register: add_stack_idempotent
-
-  - name: Assert add_stack_idempotent
-    ansible.builtin.assert:
-      that:
-        - add_stack_idempotent.data is defined
-        - add_stack_idempotent.data.serials | length == 3
-        - add_stack_idempotent is not changed
-
-  - name: Remove switch from stack
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      stack_id: '{{ stack_id }}'
-      serials:
-        - "QBSB-D75G-PXCG"
-    register: remove_from_stack
-
-  - name: Debug remove_from_stack
-    ansible.builtin.debug:
-      var: remove_from_stack
-
-  - name: Assert remove_from_stack
-    ansible.builtin.assert:
-      that:
-        - remove_from_stack.data is defined
-        - remove_from_stack.data.serials | length == 2
-        - remove_from_stack is changed
-
-  - name: Remove switch from stack idempotent
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      stack_id: '{{ stack_id }}'
-      serials:
-        - "QBSB-D75G-PXCG"
-    register: remove_from_stack_idempotent
-
-  - name: Debug remove_from_stack_idempotent
-    ansible.builtin.debug:
-      var: remove_from_stack_idempotent
-
-  - name: Assert remove_from_stack_idempotent
-    ansible.builtin.assert:
-      that:
-        - remove_from_stack_idempotent.data is defined
-        - remove_from_stack_idempotent.data.serials | length == 2
-        - remove_from_stack_idempotent is not changed
-
-  - name: Query all stacks in the network
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-    register: query_all
-
-  - name: Debug query_all
-    ansible.builtin.debug:
-      var: query_all
-
-  - name: Assert query_all
-    ansible.builtin.assert:
-      that:
-        - query_all.data is defined
-        - query_all is not changed
-
-  - name: Query one stack
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      stack_id: '{{ stack_id }}'
-    register: query_one
-
-  - name: Debug query_one
-    ansible.builtin.debug:
-      var: query_one
-
-  - name: Assert query_one
-    ansible.builtin.assert:
-      that:
-        - query_one.data is defined
-        - query_one is not changed
-
-  - name: Query one stack using name
-    cisco.meraki.meraki_ms_stack:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_switch_net_name }}'
-      name: Test stack
-    register: query_one_name
-
-  - name: Debug query_one_name
-    ansible.builtin.debug:
-      var: query_one_name
-
-  - name: Assert query_one_name
-    ansible.builtin.assert:
-      that:
-        - query_one_name.data is defined
-        - query_one_name is not changed
-
-  always:
-    - name: Delete stack
-      cisco.meraki.meraki_ms_stack:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_switch_net_name }}'
-        stack_id: '{{ stack_id }}'
-      register: delete
-
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_switch_net_name }}'
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_stack_l3_interface/tasks/main.yml b/tests/integration/targets/meraki_ms_stack_l3_interface/tasks/main.yml
deleted file mode 100644
index 04bdaf015..000000000
--- a/tests/integration/targets/meraki_ms_stack_l3_interface/tasks/main.yml
+++ /dev/null
@@ -1,281 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create network with type switch
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch
-
-  - set_fact:
-      net_id: '{{create_net_switch.data.id}}'
-
-  - name: Create new stack
-    meraki_switch_stack:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      name: Test stack
-      serials:
-      - "QBSB-BPR6-PRER"
-      - "QBSB-VLNE-E299"
-      - "QBSB-D75G-PXCG"
-    register: stack
-
-  - set_fact:
-      stack_id: '{{stack.data.id}}'
-
-  - name: Create l3 interface with check mode
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      default_gateway: "192.168.3.1"
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: create_check
-    check_mode: true
-
-  - assert:
-      that:
-        - create_check.data is defined
-        - create_check is changed
-
-  - name: Create l3 interface
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      default_gateway: "192.168.3.1"
-      name: "Test L3 interface 2"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: create
-
-  - assert:
-      that:
-        - create.data is defined
-        - create is changed
-
-  - name: Query all l3 interfaces
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      state: query
-      stack_id: '{{ stack_id }}'
-    delegate_to: localhost
-    register: query_l3
-
-  - set_fact:
-      interface_id_1: '{{create.data.interface_id}}'
-
-  - name: Query one l3 interface
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      state: query
-      stack_id: '{{ stack_id }}'
-      interface_id: '{{interface_id_1}}'
-    delegate_to: localhost
-    register: query_one
-
-  - debug:
-      var: query_one
-
-  - name: Update l3 interface with check mode
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      name: "Test L3 interface 3"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      interface_id: '{{interface_id_1}}'
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: update_check
-    check_mode: true
-
-  - assert:
-      that:
-        - update_check.data is defined
-        - update_check is changed
-
-  - name: Update l3 interface
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      name: "Test L3 interface 3"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      interface_id: '{{interface_id_1}}'
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: update
-
-  - assert:
-      that:
-        - update.data is defined
-        - update is changed
-
-  - name: Update l3 interface idempotent
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      name: "Test L3 interface 3"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: update_idempotent
-
-  - assert:
-      that:
-        update_idempotent is not changed
-
-  - name: Update l3 interface idempotent with check mode
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      name: "Test L3 interface 3"
-      subnet: "192.168.3.0/24"
-      interface_ip: "192.168.3.2"
-      multicast_routing: disabled
-      vlan_id: 11
-    delegate_to: localhost
-    register: update_idempotent_check
-    check_mode: true
-
-  - assert:
-      that:
-        update_idempotent_check is not changed
-
-
-  - name: Query all l3 interfaces
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      state: query
-      stack_id: '{{ stack_id }}'
-    delegate_to: localhost
-    register: query_l3
-
-  - debug:
-      var: query_l3
-
-  - set_fact:
-      interface_id_1: '{{query_l3.data[0].interface_id}}'
-    ignore_errors: true
-
-  - assert:
-      that:
-        - query_l3.data is defined
-        - query_l3.data | length > 0
-
-  - name: Query one l3 interface
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{ stack_id }}'
-      name: Test L3 interface
-    delegate_to: localhost
-    register: query_one
-
-  - assert:
-      that:
-        - query_one.data is defined
-
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-  - name: Delete l3 interface with check mode
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      interface_id: '{{ item }}'
-    delegate_to: localhost
-    check_mode: true
-    register: delete_check
-    loop:
-      - '{{interface_id_1}}'
-
-  - assert:
-      that:
-        - delete_check is changed
-
-  - name: Delete l3 interface
-    meraki_ms_stack_l3_interface:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      stack_id: '{{stack_id}}'
-      interface_id: '{{ interface_id_1 }}'
-    delegate_to: localhost
-    register: delete
-
-  - assert:
-      that:
-        - delete is changed
-
-  - name: Remove switches from stack
-    meraki_switch_stack:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      name: Test stack
-    register: stack
-
-  # - name: Delete network
-  #   meraki_network:
-  #     auth_key: '{{ auth_key }}'
-  #     state: absent
-  #     org_name: '{{test_org_name}}'
-  #     net_name: IntTestNetworkSwitch
-  #   delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_storm_control/tasks/main.yml b/tests/integration/targets/meraki_ms_storm_control/tasks/main.yml
deleted file mode 100644
index 6c09875ee..000000000
--- a/tests/integration/targets/meraki_ms_storm_control/tasks/main.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Create switch network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-      timezone: America/Chicago
-      type: switch
-    delegate_to: localhost
-    register: net
-
-  - name: Set fact net
-    ansible.builtin.set_fact:
-      net_id: '{{ net.data.id }}'
-
-  - name: Add device to network
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-      serial: '{{ serial_switch_l3 }}'
-    delegate_to: localhost
-
-  - name: Reset data
-    cisco.meraki.meraki_ms_storm_control:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-      broadcast_threshold: 100
-      multicast_threshold: 100
-      unknown_unicast_threshold: 100
-    delegate_to: localhost
-
-  - name: Set broadcast settings
-    cisco.meraki.meraki_ms_storm_control:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-      broadcast_threshold: 75
-      multicast_threshold: 70
-      unknown_unicast_threshold: 65
-    delegate_to: localhost
-    register: set_all
-
-  - name: Assert set_all
-    ansible.builtin.assert:
-      that:
-        - set_all is changed
-        - set_all.data is defined
-        - set_all.diff is defined
-        - set_all.diff.before is defined
-        - set_all.diff.after is defined
-        - '{{ set_all.data.broadcast_threshold }} == 75'
-        - '{{ set_all.data.multicast_threshold }} == 70'
-        - '{{ set_all.data.unknown_unicast_threshold }} == 65'
-
-  - name: Set broadcast settings with idempotency
-    cisco.meraki.meraki_ms_storm_control:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-      broadcast_threshold: 75
-      multicast_threshold: 70
-      unknown_unicast_threshold: 65
-    delegate_to: localhost
-    register: set_all_idempotent
-
-  - name: Assert set_all_idempotent
-    ansible.builtin.assert:
-      that:
-        - set_all_idempotent is not changed
-        - set_all_idempotent.data is defined
-        - '{{ set_all_idempotent.data.broadcast_threshold }} == 75'
-        - '{{ set_all_idempotent.data.multicast_threshold }} == 70'
-        - '{{ set_all_idempotent.data.unknown_unicast_threshold }} == 65'
-
-  - name: Query storm control settings
-    cisco.meraki.meraki_ms_storm_control:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: Home - Switch
-    delegate_to: localhost
-    register: query_all
-
-  - name: Debug query_all
-    ansible.builtin.debug:
-      var: query_all
-
-  - name: Assert query_all
-    ansible.builtin.assert:
-      that:
-        - query_all.data is defined
-
-  # always:
-  #   - name: Delete switch network
-  #     cisco.meraki.meraki_network:
-  #       auth_key: '{{ auth_key }}'
-  #       state: absent
-  #       org_name: '{{ test_org_name }}'
-  #       net_name: Home - Switch
-  #     delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ms_switchport/tasks/main.yml b/tests/integration/targets/meraki_ms_switchport/tasks/main.yml
deleted file mode 100644
index 1ad1f2d6f..000000000
--- a/tests/integration/targets/meraki_ms_switchport/tasks/main.yml
+++ /dev/null
@@ -1,829 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Test an API key is provided
-  ansible.builtin.fail:
-    msg: Please define an API key
-  when: auth_key is not defined
-
-- name: Query all switchports
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: query
-    serial: '{{ serial_switch }}'
-  delegate_to: localhost
-  register: query_all
-
-- name: Debug query_all
-  ansible.builtin.debug:
-    msg: '{{ query_all }}'
-
-- name: Query one switchport
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: query
-    serial: '{{ serial_switch }}'
-    number: 1
-  delegate_to: localhost
-  register: query_one
-
-- name: Debug query_all
-  ansible.builtin.debug:
-    msg: '{{ query_one }}'
-
-- name: Enable switchport with check mode
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Temporary
-  delegate_to: localhost
-  check_mode: true
-  register: update_port_true_check
-
-- name: Debug update_port_true_check
-  ansible.builtin.debug:
-    msg: '{{ update_port_true_check }}'
-
-- name: Assert update_port_true_check
-  ansible.builtin.assert:
-    that:
-      - update_port_true_check is changed
-      - update_port_true_check.data is defined
-
-- name: Enable switchport
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-  delegate_to: localhost
-  register: update_port_true
-
-- name: Debug update_port_true
-  ansible.builtin.debug:
-    msg: '{{ update_port_true }}'
-
-- name: Assert update_port_true
-  ansible.builtin.assert:
-    that:
-      - update_port_true.data.enabled == True
-
-- name: Disable switchport
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: false
-  delegate_to: localhost
-  register: update_port_false
-
-- name: Debug update_port_false
-  ansible.builtin.debug:
-    msg: '{{ update_port_false }}'
-
-- name: Assert update_port_false
-  ansible.builtin.assert:
-    that:
-      - update_port_false.data.enabled == False
-
-- name: Name switchport
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    name: Test Port
-  delegate_to: localhost
-  register: update_port_name
-
-- name: Debug update_port_name
-  ansible.builtin.debug:
-    msg: '{{ update_port_name }}'
-
-- name: Assert update_port_name
-  ansible.builtin.assert:
-    that:
-      - update_port_name.data.name == 'Test Port'
-
-- name: Configure access port with check mode
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-  delegate_to: localhost
-  check_mode: true
-  register: update_access_port_changed
-
-- name: Debug update_access_port_changed
-  ansible.builtin.debug:
-    msg: '{{ update_access_port_changed }}'
-
-- name: Assert update_access_port_changed
-  ansible.builtin.assert:
-    that:
-      - update_access_port_changed is changed
-      - update_access_port_changed.data is defined
-
-- name: Configure access port
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-  delegate_to: localhost
-  register: update_access_port
-
-- name: Debug update_access_port
-  ansible.builtin.debug:
-    msg: '{{ update_access_port }}'
-
-- name: Assert update_access_port
-  ansible.builtin.assert:
-    that:
-      - update_access_port.data.vlan == 10
-
-- name: Configure flexible stacking
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch_l3 }}'
-    number: 7
-    enabled: true
-    flexible_stacking_enabled: true
-  delegate_to: localhost
-  register: flex_stacking_enabled
-
-- name: Debug flex_stacking_enabled
-  ansible.builtin.debug:
-    msg: '{{ flex_stacking_enabled }}'
-
-- name: Assert flex_stacking_enabled
-  ansible.builtin.assert:
-    that:
-      - flex_stacking_enabled.data.flexible_stacking_enabled == true
-
-# - name: Configure adaptive policy and SGT
-#   cisco.meraki.meraki_ms_switchport:
-#     auth_key: '{{ auth_key }}'
-#     state: present
-#     serial: '{{ serial_switch_l3 }}'
-#     number: 7
-#     enabled: true
-#     adaptive_policy_group_id: "1234"
-#     peer_sgt_capable: true
-#   delegate_to: localhost
-#   register: adaptive_policy
-
-# - ansible.builtin.debug:
-#     msg: '{{adaptive_policy}}'
-
-# - ansible.builtin.assert:
-#     that:
-#       - adaptive_policy.data.adaptive_policy_group_id == "1234"
-#       - adaptive_policy.data.peer_sgt_capable == true
-
-- name: Configure port as trunk
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 8
-    enabled: true
-    name: Test Port
-    type: trunk
-    vlan: 10
-    allowed_vlans: 10, 100, 200
-  delegate_to: localhost
-
-- name: Remove VLAN on switchport
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 8
-    enabled: true
-    type: trunk
-    vlan: 0
-  delegate_to: localhost
-  register: remove_vlan
-
-- name: Debug remove_vlan
-  ansible.builtin.debug:
-    msg: '{{ remove_vlan }}'
-
-- name: Assert remove_vlan
-  ansible.builtin.assert:
-    that:
-      - remove_vlan.data.vlan == None
-
-- name: Convert trunk port to access
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 8
-    enabled: true
-    name: Test Port
-    type: access
-    vlan: 10
-  delegate_to: localhost
-
-- name: Test converted port for idempotency
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 8
-    enabled: true
-    name: Test Port
-    type: access
-    vlan: 10
-  delegate_to: localhost
-  register: convert_idempotent
-
-- name: Assert convert_idempotent
-  ansible.builtin.assert:
-    that:
-      - convert_idempotent.changed == False
-
-- name: Change voice VLAN for next task
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-    voice_vlan: 12
-  delegate_to: localhost
-  register: update_port_vvlan
-
-- name: Configure access port with voice VLAN
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-    voice_vlan: 11
-  delegate_to: localhost
-  register: update_port_vvlan
-
-- name: Debug update_port_vvlan
-  ansible.builtin.debug:
-    msg: '{{ update_port_vvlan }}'
-
-- name: Assert update_port_vvlan
-  ansible.builtin.assert:
-    that:
-      - update_port_vvlan.data.voice_vlan == 11
-      - update_port_vvlan.changed == True
-
-- name: Check access port for idempotenty
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-    voice_vlan: 11
-  delegate_to: localhost
-  register: update_port_access_idempotent
-
-- name: Debug update_port_access_idempotent
-  ansible.builtin.debug:
-    msg: '{{ update_port_access_idempotent }}'
-
-- name: Assert update_port_access_idempotent
-  ansible.builtin.assert:
-    that:
-      - update_port_access_idempotent.changed == False
-      - update_port_access_idempotent.data is defined
-
-- name: Configure access port removing voice VLAN
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Test Port
-    tags: desktop
-    type: access
-    vlan: 10
-    voice_vlan_state: absent
-  delegate_to: localhost
-  register: update_port_remove_vvlan
-
-- name: Debut update_port_remove_vvlan
-  ansible.builtin.debug:
-    msg: '{{ update_port_remove_vvlan }}'
-
-- name: Assert
-  ansible.builtin.assert:
-    that:
-      - update_port_remove_vvlan.data.voice_vlan == None
-      - update_port_remove_vvlan.changed == True
-
-- name: Configure trunk port
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Server port
-    tags: server
-    type: trunk
-    allowed_vlans: all
-    vlan: 8
-  delegate_to: localhost
-  register: update_trunk
-
-- name: Debug update_trunk
-  ansible.builtin.debug:
-    msg: '{{ update_trunk }}'
-
-- name: Assert update_trunk
-  ansible.builtin.assert:
-    that:
-      - update_trunk.data.tags.0 == 'server'
-      - update_trunk.data.type == 'trunk'
-      - update_trunk.data.allowed_vlans == 'all'
-
-- name: Configure trunk port with specific VLANs
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Server port
-    tags: server
-    type: trunk
-    vlan: 8
-    allowed_vlans:
-      - 10
-      - 15
-      - 20
-  delegate_to: localhost
-  register: update_trunk
-
-- name: Debug update_trunk
-  ansible.builtin.debug:
-    msg: '{{ update_trunk }}'
-
-- name: Assert update_trunk
-  ansible.builtin.assert:
-    that:
-      - update_trunk.data.tags.0 == 'server'
-      - update_trunk.data.type == 'trunk'
-      - update_trunk.data.allowed_vlans == '8,10,15,20'
-
-- name: Configure trunk port with specific VLANs and native VLAN
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Server port
-    tags: server
-    type: trunk
-    vlan: 2
-    allowed_vlans:
-      - 10
-      - 15
-      - 20
-  delegate_to: localhost
-  register: update_trunk
-
-- name: Debug update_trunk
-  ansible.builtin.debug:
-    msg: '{{ update_trunk }}'
-
-- name: Assert update_trunk
-  ansible.builtin.assert:
-    that:
-      - update_trunk.data.tags.0 == 'server'
-      - update_trunk.data.type == 'trunk'
-      - update_trunk.data.allowed_vlans == '2,10,15,20'
-
-- name: Check for idempotency on trunk port
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    name: Server port
-    tags: server
-    type: trunk
-    vlan: 2
-    allowed_vlans:
-      - 10
-      - 15
-      - 20
-  delegate_to: localhost
-  register: update_trunk_idempotent
-
-- name: Debug update_trunk_idempotent
-  ansible.builtin.debug:
-    msg: '{{ update_trunk_idempotent }}'
-
-- name: Assert update_trunk_idempotent
-  ansible.builtin.assert:
-    that:
-      - update_trunk_idempotent.changed == False
-      - update_trunk_idempotent.data is defined
-
-# - name: Enable Sticky MAC Using Replace
-#   cisco.meraki.meraki_ms_switchport:
-#     auth_key: '{{ auth_key }}'
-#     state: present
-#     serial: '{{ serial_switch }}'
-#     number: 7
-#     enabled: true
-#     type: access
-#     access_policy_type: "Sticky MAC allow list"
-#     sticky_mac_allow_list:
-#       macs:
-#         - "aa:aa:bb:bb:cc:cc"
-#       state: replaced
-#     sticky_mac_allow_list_limit: 1
-#   delegate_to: localhost
-#   register: sticky_mac_allow_replace
-
-# - name: Debug sticky_mac_allow_replace
-#   ansible.builtin.debug:
-#     msg: '{{ sticky_mac_allow_replace }}'
-
-# - name: Assert sticky_mac_allow_replace
-#   ansible.builtin.assert:
-#     that:
-#       - sticky_mac_allow_replace.data.sticky_mac_allow_list_limit == 1
-#       - sticky_mac_allow_replace.data.sticky_mac_allow_list == ["aa:aa:bb:bb:cc:cc"]
-
-- name: Enable Sticky MAC Using Replace Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "Sticky MAC allow list"
-    sticky_mac_allow_list:
-      macs:
-        - "aa:aa:bb:bb:cc:cc"
-      state: replaced
-    sticky_mac_allow_list_limit: 1
-  delegate_to: localhost
-  register: idempotent_sticky_mac_allow_replace
-
-- name: Debug idempotent_sticky_mac_allow_replace
-  ansible.builtin.debug:
-    msg: '{{ idempotent_sticky_mac_allow_replace }}'
-
-- name: Assert idempotent_mac_allow_replace
-  ansible.builtin.assert:
-    that:
-      - idempotent_sticky_mac_allow_replace.changed == False
-      - idempotent_sticky_mac_allow_replace.data is defined
-
-- name: Enable Sticky MAC Using Merge
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "Sticky MAC allow list"
-    sticky_mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: merged
-    sticky_mac_allow_list_limit: 2
-  delegate_to: localhost
-  register: sticky_mac_allow_merge
-
-- name: Debug sticky_mac_allow_merge
-  ansible.builtin.debug:
-    msg: '{{ sticky_mac_allow_merge }}'
-
-- name: Assert sticky_mac_allow_merge
-  ansible.builtin.assert:
-    that:
-      - sticky_mac_allow_merge.data.sticky_mac_allow_list_limit == 2
-      - sticky_mac_allow_merge.data.sticky_mac_allow_list == ["aa:aa:bb:bb:cc:cc", "11:aa:bb:bb:cc:cc"]
-
-- name: Enable Sticky MAC Using Merge Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "Sticky MAC allow list"
-    sticky_mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: merged
-    sticky_mac_allow_list_limit: 2
-  delegate_to: localhost
-  register: idempotent_sticky_mac_allow_merge
-
-- name: Debug idempotent_sticky_mac_allow_merge
-  ansible.builtin.debug:
-    msg: '{{ idempotent_sticky_mac_allow_merge }}'
-
-- name: Assert idempotent_sticky_mac_allow_merge
-  ansible.builtin.assert:
-    that:
-      - idempotent_sticky_mac_allow_merge.changed == False
-      - idempotent_sticky_mac_allow_merge.data is defined
-
-- name: Delete Sticky MAC From Allow List
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "Sticky MAC allow list"
-    sticky_mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: deleted
-    sticky_mac_allow_list_limit: 2
-  delegate_to: localhost
-  register: delete_sticky_mac
-
-- name: Debug delete_sticky_mac
-  ansible.builtin.debug:
-    msg: '{{ delete_sticky_mac }}'
-
-- name: Assert delete_sticky_mac
-  ansible.builtin.assert:
-    that:
-      - delete_sticky_mac.data.sticky_mac_allow_list_limit == 2
-      - delete_sticky_mac.data.sticky_mac_allow_list == ["aa:aa:bb:bb:cc:cc"]
-
-- name: Delete Sticky MAC Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "Sticky MAC allow list"
-    sticky_mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: deleted
-    sticky_mac_allow_list_limit: 2
-  delegate_to: localhost
-  register: idempotent_delete_sticky_mac
-
-- name: Debug idempotent_delete_sticky_mac
-  ansible.builtin.debug:
-    msg: '{{ idempotent_delete_sticky_mac }}'
-
-- name: Assert idempotent_delete_sticky_mac
-  ansible.builtin.assert:
-    that:
-      - idempotent_delete_sticky_mac.changed == False
-      - idempotent_delete_sticky_mac.data is defined
-
-- name: Enable MAC Allow Using Replace
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "aa:aa:bb:bb:cc:cc"
-      state: replaced
-  delegate_to: localhost
-  register: mac_allow_replace
-
-- name: Debug mac_allow_replace
-  ansible.builtin.debug:
-    msg: '{{ mac_allow_replace }}'
-
-- name: Assert mac_allow_replace
-  ansible.builtin.assert:
-    that:
-      - mac_allow_replace.data.mac_allow_list == ["aa:aa:bb:bb:cc:cc"]
-
-- name: Enable MAC Allow Using Replace Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "aa:aa:bb:bb:cc:cc"
-      state: replaced
-  delegate_to: localhost
-  register: idempotent_mac_allow_replace
-
-- name: Debug idempotent_mac_allow_replace
-  ansible.builtin.debug:
-    msg: '{{ idempotent_mac_allow_replace }}'
-
-- name: Assert idempotent_mac_allow_replace
-  ansible.builtin.assert:
-    that:
-      - idempotent_mac_allow_replace.changed == False
-      - idempotent_mac_allow_replace.data is defined
-
-- name: Enable MAC Allow Using Merge
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: merged
-  delegate_to: localhost
-  register: mac_allow_merge
-
-- name: Debug mac_allow_merge
-  ansible.builtin.debug:
-    msg: '{{ mac_allow_merge }}'
-
-- name: Assert mac_allow_merge
-  ansible.builtin.assert:
-    that:
-      - mac_allow_merge.data.mac_allow_list == ["aa:aa:bb:bb:cc:cc", "11:aa:bb:bb:cc:cc"]
-
-- name: Enable MAC Allow Using Merge Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: merged
-  delegate_to: localhost
-  register: idempotent_mac_allow_merge
-
-- name: Debug idempotent_mac_allow_merge
-  ansible.builtin.debug:
-    msg: '{{ idempotent_mac_allow_merge }}'
-
-- name: Assert idempotent_mac_allow_merge
-  ansible.builtin.assert:
-    that:
-      - idempotent_mac_allow_merge.changed == False
-      - idempotent_mac_allow_merge.data is defined
-
-- name: Delete MAC From Allow List
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: deleted
-  delegate_to: localhost
-  register: delete_mac
-
-- name: Debug delete_mac
-  ansible.builtin.debug:
-    msg: '{{ delete_mac }}'
-
-- name: Assert delete_mac
-  ansible.builtin.assert:
-    that:
-      - delete_mac.data.mac_allow_list == ["aa:aa:bb:bb:cc:cc"]
-
-- name: Delete MAC Idempotent
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: '{{ auth_key }}'
-    state: present
-    serial: '{{ serial_switch }}'
-    number: 7
-    enabled: true
-    type: access
-    access_policy_type: "MAC allow list"
-    mac_allow_list:
-      macs:
-        - "11:aa:bb:bb:cc:cc"
-      state: deleted
-  delegate_to: localhost
-  register: idempotent_delete_mac
-
-- name: Debug idempotent_delete_mac
-  ansible.builtin.debug:
-    msg: '{{ idempotent_delete_mac }}'
-
-- name: Assert idempotent_delete_mac
-  ansible.builtin.assert:
-    that:
-      - idempotent_delete_mac.changed == False
-      - idempotent_delete_mac.data is defined
-
-- name: Change the switchport to 1 GB to auto
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: "{{ auth_key }}"
-    link_negotiation: "Auto negotiate"
-    number: 9
-    serial: "{{ serial_switch }}"
-    state: present
-  register: forced_change_port
-
-- name: Change the switchport to 1 GB forced
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: "{{ auth_key }}"
-    link_negotiation: "1 Gigabit full duplex (forced)"
-    number: 9
-    serial: "{{ serial_switch }}"
-    state: present
-  register: forced_change_port
-
-- name: Debug forced_change_port
-  ansible.builtin.debug:
-    msg: "{{ forced_change_port }}"
-
-- name: Assert the port forced port
-  ansible.builtin.assert:
-    that:
-      - forced_change_port.changed == True
-      - forced_change_port.data.link_negotiation == "1 Gigabit full duplex (forced)"
-
-- name: Change the switchport to 1 GB auto
-  cisco.meraki.meraki_ms_switchport:
-    auth_key: "{{ auth_key }}"
-    link_negotiation: "1 Gigabit full duplex (auto)"
-    number: 9
-    serial: "{{ serial_switch }}"
-    state: present
-  register: auto_change_port
-
-- name: Debug auto_change_port
-  ansible.builtin.debug:
-    msg: "{{ auto_change_port }}"
-
-- name: Assert the port auto port
-  ansible.builtin.assert:
-    that:
-      - auto_change_port.changed == True
-      - auto_change_port.data.link_negotiation == "1 Gigabit full duplex (auto)"
diff --git a/tests/integration/targets/meraki_mx_content_filtering/tasks/main.yml b/tests/integration/targets/meraki_mx_content_filtering/tasks/main.yml
deleted file mode 100644
index b139ede74..000000000
--- a/tests/integration/targets/meraki_mx_content_filtering/tasks/main.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-# Test code for the Meraki Content Filteringmodule
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      type: appliance
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_appliance
-
-  - name: Test net_name and id exclusivity
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      net_id: 12345
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-    register: net_exclusive
-    failed_when: false
-    changed_when: false
-
-  - name: Assert net_exclusive
-    ansible.builtin.assert:
-      that:
-        - 'net_exclusive.msg == "net_name and net_id are mutually exclusive"'
-
-  - name: Set blocked URL categories for idempotency test
-    cisco.meraki.meraki_mx_content_filtering:
-      state: present
-      auth_key: "{{ auth_key }}"
-      org_name: "{{ test_org_name }}"
-      net_name: "{{ test_net_name }}"
-      category_list_size: full list
-      blocked_categories:
-        - "Adult"
-        - "Advertisements"
-        - "Alcohol"
-    delegate_to: localhost
-
-  # - name: Set blocked URL categories with idempotency
-  #   cisco.meraki.meraki_mx_content_filtering:
-  #     state: present
-  #     auth_key: "{{ auth_key }}"
-  #     org_name: "{{ test_org_name }}"
-  #     net_name: "{{ test_net_name }}"
-  #     category_list_size: full list
-  #     blocked_categories:
-  #       - "Adult"
-  #       - "Advertisements"
-  #       - "Alcohol"
-  #   delegate_to: localhost
-  #   register: category_idempotent
-
-  # - name: Assert category_idempotent
-  #   ansible.builtin.assert:
-  #     that:
-  #       - category_idempotent is not changed
-  #       - category_idempotent.data is defined
-
-  - name: Set single allowed URL pattern with check mode
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-    register: single_allowed_check
-    check_mode: true
-
-  - name: Assert single_allowed_check
-    ansible.builtin.assert:
-      that:
-        - single_allowed_check.data.allowed_url_patterns | length == 1
-        - single_allowed_check is changed
-
-  - name: Set single allowed URL pattern
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-    register: single_allowed
-
-  - name: Assert single_allowed
-    ansible.builtin.assert:
-      that:
-        - single_allowed.data.allowed_url_patterns | length == 1
-
-  - name: Set single allowed URL pattern for idempotency with check mode
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-    register: single_allowed_idempotent_check
-    check_mode: true
-
-  - name: Debug single_allowed_idempotent_check
-    ansible.builtin.debug:
-      var: single_allowed_idempotent_check
-
-  - name: Assert single_allowed and single_allowed_idempotent_check
-    ansible.builtin.assert:
-      that:
-        - single_allowed_idempotent_check is not changed
-        - single_allowed.data.allowed_url_patterns | length == 1
-
-  - name: Set single allowed URL pattern for idempotency
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-    register: single_allowed_idempotent
-
-  - name: Debug single_allowed_idempotent
-    ansible.builtin.debug:
-      var: single_allowed_idempotent
-
-  - name: Assert single_allowed_idempotent
-    ansible.builtin.assert:
-      that:
-        - single_allowed_idempotent.changed == False
-        - single_allowed_idempotent.data is defined
-
-  - name: Set single blocked URL pattern
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      blocked_urls:
-        - "http://www.ansible.com/*"
-    register: single_blocked
-
-  - name: Debug single_blocked
-    ansible.builtin.debug:
-      var: single_blocked
-
-  - name: Assert single_blocked
-    ansible.builtin.assert:
-      that:
-        - single_blocked.data.blocked_url_patterns | length == 1
-
-  - name: Set two allowed URL pattern
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      allowed_urls:
-        - "http://www.ansible.com/*"
-        - "http://www.redhat.com"
-    register: two_allowed
-
-  - name: Debug two_allowed
-    ansible.builtin.debug:
-      var: two_allowed
-
-  - name: Debug two_allowed
-    ansible.builtin.assert:
-      that:
-        - two_allowed.changed == True
-        - two_allowed.data.allowed_url_patterns | length == 2
-
-  - name: Set blocked URL category
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: present
-      category_list_size: full list
-      blocked_categories:
-        - "Adult"
-    register: blocked_category
-
-  - name: Debug blocked_category
-    ansible.builtin.debug:
-      var: blocked_category
-
-  - name: Assert blocked_category
-    ansible.builtin.assert:
-      that:
-        - blocked_category.changed == True
-        - blocked_category.data.blocked_url_categories | length == 1
-        # - blocked_category.data.url_category_list_size == "fullList"
-
-  # - name: Set blocked URL category with top sites
-  #   cisco.meraki.meraki_mx_content_filtering:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{ test_org_name }}'
-  #     net_name: '{{ test_net_name }}'
-  #     state: present
-  #     category_list_size: top sites
-  #     blocked_categories:
-  #       - "Adult"
-  #   register: blocked_category
-
-  # - name: Debug blocked_category
-  #   ansible.builtin.debug:
-  #     var: blocked_category
-
-  # - name: Assert blocked_category
-  #   ansible.builtin.assert:
-  #     that:
-  #       - blocked_category.changed == True
-  #       - blocked_category.data.blocked_url_categories | length == 1
-  #       # - blocked_category.data.url_category_list_size == "topSites"
-
-  - name: Query all content filtering information
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: query
-    delegate_to: localhost
-    register: query_all
-
-  - name: Debug query_all
-    ansible.builtin.debug:
-      var: query_all
-
-  - name: Query all content filtering assertion
-    ansible.builtin.assert:
-      that:
-        - query_all.data.categories is defined
-        - query_all.data.policy is defined
-
-  - name: Query categories
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      state: query
-      subset: categories
-    delegate_to: localhost
-    register: query_categories
-
-  - name: Debug query_categories
-    ansible.builtin.debug:
-      var: query_categories
-
-  - name: Query categories assertion
-    ansible.builtin.assert:
-      that:
-        - query_categories.data is defined
-
-  - name: Query content filtering policies
-    cisco.meraki.meraki_mx_content_filtering:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: '{{ test_net_name }}'
-      subset: policy
-      state: query
-    delegate_to: localhost
-    register: query_policy
-
-  - name: Debug query_policy
-    ansible.builtin.debug:
-      var: query_policy
-
-  - name: Query contnet filtering policy assertion
-    ansible.builtin.assert:
-      that:
-        - query_policy.data is defined
-
-  always:
-    - name: Reset policies
-      cisco.meraki.meraki_mx_content_filtering:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        category_list_size: full list
-        allowed_urls:
-          -
-        blocked_urls:
-          -
-        blocked_categories:
-          -
-
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: absent
diff --git a/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/main.yml b/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/main.yml
deleted file mode 100644
index c04238da9..000000000
--- a/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki Webhooks module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  ansible.builtin.include_tasks: tests.yml
diff --git a/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/tests.yml b/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/tests.yml
deleted file mode 100644
index 704738ccd..000000000
--- a/tests/integration/targets/meraki_mx_intrusion_prevention/tasks/tests.yml
+++ /dev/null
@@ -1,330 +0,0 @@
-# Test code for the Meraki IPS module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tests
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create test network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        type: appliance
-      register: net
-
-    - name: Debug net
-      ansible.builtin.debug:
-        var: net
-
-    - name: Set allowed rules for organization in check mode
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        allowed_rules:
-          - rule_id: "meraki:intrusion/snort/GID/01/SID/5805"
-            rule_message: Test rule
-      check_mode: true
-      register: create_org_check
-
-    - name: Assert create_org_check
-      ansible.builtin.assert:
-        that:
-          - create_org_check is changed
-          - create_org_check.data is defined
-
-    - name: Set allowed rules for organization
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_id: "{{ test_org_id }}"
-        allowed_rules:
-          - rule_id: "meraki:intrusion/snort/GID/01/SID/5805"
-            rule_message: Test rule
-      register: create_org
-
-    - name: Assert create_org
-      ansible.builtin.assert:
-        that:
-          - create_org is changed
-          - create_org.data is defined
-          - create_org.data.allowed_rules | length == 1
-
-    - name: Set allowed rules for organization with idempotency
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_id: "{{ test_org_id }}"
-        allowed_rules:
-          - rule_id: "meraki:intrusion/snort/GID/01/SID/5805"
-            rule_message: Test rule
-      register: create_org_idempotent
-
-    - name: Assert create_org_idempotent
-      ansible.builtin.assert:
-        that:
-          - create_org_idempotent is not changed
-          - create_org_idempotent.data is defined
-
-    - name: Query IPS info for organization
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-      register: query_org
-
-    - name: Assert query_org
-      ansible.builtin.assert:
-        that:
-          - query_org.data.allowed_rules is defined
-
-    - name: Set mode to prevention with check mode
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-      check_mode: true
-      register: mode_check
-
-    - name: Assert mode_check
-      ansible.builtin.assert:
-        that:
-          - mode_check is changed
-          - mode_check.data is defined
-
-    - name: Set mode to prevention
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-      register: mode
-
-    - name: Debug mode
-      ansible.builtin.debug:
-        var: mode
-
-    - name: Assert mode
-      ansible.builtin.assert:
-        that:
-          - mode is changed
-          - mode.data.mode is defined
-
-    - name: Set mode to prevention with idempotency
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-      register: mode_idempotent
-
-    - name: Debug mode_idempotent
-      ansible.builtin.debug:
-        var: mode_idempotent
-
-    - name: Assert mode_idempotent
-      ansible.builtin.assert:
-        that:
-          - mode_idempotent is not changed
-          - mode_idempotent.data.mode is defined
-
-    - name: Set full ruleset with check mode
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-        ids_rulesets: security
-        protected_networks:
-          use_default: true
-          included_cidr:
-            - 192.0.1.0/24
-          excluded_cidr:
-            - 10.0.1.0/24
-      check_mode: true
-      register: full_check
-
-    - name: Debug full_check
-      ansible.builtin.debug:
-        var: full_check
-
-    - name: Assert full_check
-      ansible.builtin.assert:
-        that:
-          - full_check is changed
-          - full_check.data.mode is defined
-
-    # Meraki says protectedNetworks isn't supported on layer 3 firewalls
-    # Passthrough mode cannot be set via API
-    # - name: Set full ruleset
-    #   cisco.meraki.meraki_mx_intrusion_prevention:
-    #     auth_key: '{{ auth_key }}'
-    #     state: present
-    #     org_name: '{{ test_org_name }}'
-    #     net_name: '{{ test_net_name }} - IPS'
-    #     mode: detection
-    #     ids_rulesets: security
-    #     protected_networks:
-    #       use_default: true
-    #       included_cidr:
-    #         - 192.0.1.0/24
-    #       excluded_cidr:
-    #         - 10.0.1.0/24
-    #   delegate_to: localhost
-    #   register: full
-
-    # - ansible.builtin.debug:
-    #     var: full
-
-    # - ansible.builtin.assert:
-    #     that:
-    #       - full is changed
-    #       - full.data.mode is defined
-
-    # Meraki says protectedNetworks isn't supported on layer 3 firewalls
-    # Passthrough mode cannot be set via API
-    # - name: Set full ruleset with idempotency
-    #   cisco.meraki.meraki_mx_intrusion_prevention:
-    #     auth_key: '{{ auth_key }}'
-    #     state: present
-    #     org_name: '{{ test_org_name }}'
-    #     net_name: '{{ test_net_name }} - IPS'
-    #     mode: prevention
-    #     ids_rulesets: security
-    #     protected_networks:
-    #       use_default: true
-    #       included_cidr:
-    #         - 192.0.1.0/24
-    #       excluded_cidr:
-    #         - 10.0.1.0/24
-    #   delegate_to: localhost
-    #   register: full_idempotent
-
-    # - ansible.builtin.debug:
-    #     var: full_idempotent
-
-    # - ansible.builtin.assert:
-    #     that:
-    #       - full_idempotent is not changed
-    #       - full_idempotent.data.mode is defined
-
-    - name: Query IPS info for network
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: query
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-      register: query_net
-
-    - name: Assert query_net
-      ansible.builtin.assert:
-        that:
-          - query_net is defined
-
-    - name: Test use_default error with included_cidr
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-        ids_rulesets: security
-        protected_networks:
-          use_default: false
-          excluded_cidr:
-            - 10.0.1.0/24
-      check_mode: true
-      register: included_missing
-      ignore_errors: true
-
-    - name: Assert included_missing
-      ansible.builtin.assert:
-        that:
-          - 'included_missing.msg == "included_cidr is required when use_default is False."'
-
-    - name: Test use_default error with included_cidr
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-        mode: prevention
-        ids_rulesets: security
-        protected_networks:
-          use_default: false
-          included_cidr:
-            - 10.0.1.0/24
-      check_mode: true
-      register: excluded_missing
-      ignore_errors: true
-
-    - name: Assert excluded_missing
-      ansible.builtin.assert:
-        that:
-          - 'excluded_missing.msg == "excluded_cidr is required when use_default is False."'
-
-  # #############################################################################
-  # # Tear down starts here
-  # #############################################################################
-  always:
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
-      register: delete_net
-
-    - name: Clear rules from organization with check mode
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        allowed_rules: []
-      check_mode: true
-      register: cleared
-
-    - name: Assert cleared
-      ansible.builtin.assert:
-        that:
-          - cleared is changed
-          - cleared.data is defined
-
-    - name: Clear rules from organization
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        allowed_rules: []
-    - name: Clear rules from organization with idempotency
-      cisco.meraki.meraki_mx_intrusion_prevention:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        allowed_rules: []
-      register: del_idempotent
-
-    - name: Assert del_idempotent
-      ansible.builtin.assert:
-        that:
-          - del_idempotent is not changed
-          - del_idempotent.data is defined
-
-    - name: Delete test network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }} - IPS"
diff --git a/tests/integration/targets/meraki_mx_l2_interface/tasks/main.yml b/tests/integration/targets/meraki_mx_l2_interface/tasks/main.yml
deleted file mode 100644
index 36b7a2fb2..000000000
--- a/tests/integration/targets/meraki_mx_l2_interface/tasks/main.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-    - name: Create network with type appliance
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        type: appliance
-        timezone: America/Chicago
-      delegate_to: localhost
-      register: create_net
-
-    - name: Claim a device into a network
-      cisco.meraki.meraki_device:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        serial: "{{ serial_appliance }}"
-        state: present
-      delegate_to: localhost
-
-    - name: Enable VLAN support on appliance network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        enable_vlans: true
-      delegate_to: localhost
-
-    - name: Create a VLAN
-      cisco.meraki.meraki_mx_vlan:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: present
-        vlan_id: 10
-        name: TestVLAN
-        subnet: 192.0.10.0/24
-        appliance_ip: 192.0.10.1
-      delegate_to: localhost
-
-    - name: Query layer 2 interface settings
-      cisco.meraki.meraki_mx_l2_interface:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: query
-      delegate_to: localhost
-      register: query_all
-
-    - name: Assert query_all
-      ansible.builtin.assert:
-        that:
-          - query_all.data is defined
-
-    - name: Query a single layer 2 interface settings
-      cisco.meraki.meraki_mx_l2_interface:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: query
-        number: 2
-      delegate_to: localhost
-      register: query_one
-
-    - name: Assert query_one
-      ansible.builtin.assert:
-        that:
-          - query_one.data is defined
-
-    - name: Update interface configuration with check mode
-      cisco.meraki.meraki_mx_l2_interface:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: present
-        number: 2
-        port_type: access
-        vlan: 10
-      delegate_to: localhost
-      register: update_check
-      check_mode: true
-
-    - name: Debug update_check
-      ansible.builtin.debug:
-        var: update_check
-
-    - name: Assert update_check
-      ansible.builtin.assert:
-        that:
-          - update_check.data is defined
-          - update_check.data.vlan == 10
-          - update_check is changed
-
-    - name: Update interface configuration
-      cisco.meraki.meraki_mx_l2_interface:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: present
-        number: 2
-        port_type: access
-        vlan: 10
-      delegate_to: localhost
-      register: update
-
-    - name: Assert update
-      ansible.builtin.assert:
-        that:
-          - update.diff is defined
-          - update.data is defined
-          - update.data.vlan == 10
-          - update is changed
-
-    - name: Update interface configuration with idempotency
-      cisco.meraki.meraki_mx_l2_interface:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        state: present
-        number: 2
-        port_type: access
-        vlan: 10
-      delegate_to: localhost
-      register: update_idempotent
-
-    - name: Assert update_idempotent
-      ansible.builtin.assert:
-        that:
-          - update_idempotent.data is defined
-          - update_idempotent.data.vlan == 10
-          - update_idempotent is not changed
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-
-  always:
-    - name: Remove device from network
-      cisco.meraki.meraki_device:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-        serial: "{{ serial_appliance }}"
-        state: absent
-      delegate_to: localhost
-
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        state: absent
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_appliance_net_name }}"
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_l3_firewall/tasks/main.yml b/tests/integration/targets/meraki_mx_l3_firewall/tasks/main.yml
deleted file mode 100644
index fb97e47be..000000000
--- a/tests/integration/targets/meraki_mx_l3_firewall/tasks/main.yml
+++ /dev/null
@@ -1,392 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        type: appliance
-      delegate_to: localhost
-
-    - name: Query firewall rules
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Assert query.data
-      ansible.builtin.assert:
-        that:
-          - query.data|length == 1
-
-    - name: Check rule values are lowercase
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Assert query.data.rules
-      ansible.builtin.assert:
-        that:
-          - query.data.rules.0.policy == 'allow'
-          - query.data.rules.0.protocol == 'any'
-          - query.data.rules.0.src_port == 'any'
-          - query.data.rules.0.src_cidr == 'any'
-          - query.data.rules.0.dest_port == 'any'
-          - query.data.rules.0.dest_cidr == 'any'
-
-    - name: Set one firewall rule with check mode
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      check_mode: true
-      register: create_one_check
-
-    - name: Debug create_one_check
-      ansible.builtin.debug:
-        var: create_one_check
-
-    - name: Assert create_one_check
-      ansible.builtin.assert:
-        that:
-          - create_one_check.data|length == 2
-          - create_one_check.data.0.dest_cidr == '192.0.1.1/32'
-          - create_one_check.data.0.protocol == 'tcp'
-          - create_one_check.data.0.policy == 'deny'
-          - create_one_check is changed
-          - create_one_check.data is defined
-
-    - name: Set one firewall rule
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_id: "{{ test_org_id }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: create_one
-
-    - name: Debug create_one
-      ansible.builtin.debug:
-        var: create_one
-
-    - name: Assert create_one
-      ansible.builtin.assert:
-        that:
-          - create_one.data.rules|length == 2
-          - create_one.data.rules.0.dest_cidr == '192.0.1.1/32'
-          - create_one.data.rules.0.protocol == 'tcp'
-          - create_one.data.rules.0.policy == 'deny'
-          - create_one.changed == True
-          - create_one.data is defined
-
-    - name: Check for idempotency
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: create_one_idempotent
-
-    - name: Debug create_one_idempotent
-      ansible.builtin.debug:
-        msg: "{{ create_one_idempotent }}"
-
-    - name: Assert create_one_idempotent
-      ansible.builtin.assert:
-        that:
-          - create_one_idempotent.changed == False
-          - create_one_idempotent.data is defined
-
-    - name: Update one existing rule
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny all documentation addresses
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32,192.0.1.2/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: update_one
-
-    - name: Debug update_one
-      ansible.builtin.debug:
-        msg: "{{ update_one }}"
-
-    - name: Assert update_one
-      ansible.builtin.assert:
-        that:
-          - update_one.changed == True
-          - update_one.data is defined
-
-    - name: Create syslog in network
-      cisco.meraki.meraki_syslog:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        servers:
-          - host: 192.0.2.10
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-      delegate_to: localhost
-
-    - name: Enable syslog for default rule with check mode
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: true
-      delegate_to: localhost
-      check_mode: true
-      register: default_syslog_check
-
-    - name: Debug default_syslog_check
-      ansible.builtin.debug:
-        msg: "{{ default_syslog_check }}"
-
-    - name: Assert default_syslog_check
-      ansible.builtin.assert:
-        that:
-          - default_syslog_check.data is defined
-          - default_syslog_check.data.1.syslog_enabled == True
-
-    - name: Enable syslog for default rule
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: true
-      delegate_to: localhost
-      register: default_syslog
-
-    - name: Debug default_syslog
-      ansible.builtin.debug:
-        msg: "{{ default_syslog }}"
-
-    - name: Assert default_syslog.data
-      ansible.builtin.assert:
-        that:
-          - default_syslog.data is defined
-
-    - name: Set protocol to any for idempotency check
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: any
-            src_cidr: any
-            dest_port: any
-            dest_cidr: 192.0.1.1/32
-            protocol: any
-            policy: deny
-      delegate_to: localhost
-
-    - name: Check for protocol any idempotency
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: any
-            src_cidr: any
-            dest_port: any
-            dest_cidr: 192.0.1.1/32
-            protocol: any
-            policy: deny
-      delegate_to: localhost
-      register: any_idempotency
-
-    - name: Assert any_idempotency
-      ansible.builtin.assert:
-        that:
-          - any_idempotency is not changed
-
-    - name: Query firewall rules
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Assert query.data and default_syslog.changed
-      ansible.builtin.assert:
-        that:
-          - query.data.rules.1.syslog_enabled == True
-          - default_syslog.changed == True
-
-    - name: Disable syslog for default rule
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: false
-      delegate_to: localhost
-      register: disable_syslog
-
-    - name: Debug disable_syslog
-      ansible.builtin.debug:
-        msg: "{{ disable_syslog }}"
-
-    - name: Assert disable_syslog
-      ansible.builtin.assert:
-        that:
-          - disable_syslog.data is defined
-
-    - name: Query firewall rules
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Debug query
-      ansible.builtin.debug:
-        msg: "{{ query }}"
-
-    - name: Enable syslog for default rule with no rules and with check mode
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        syslog_default_rule: true
-      delegate_to: localhost
-      check_mode: true
-      register: enable_syslog_only_check
-
-    - name: Debug enable_syslog_only_check
-      ansible.builtin.debug:
-        msg: "{{ enable_syslog_only_check }}"
-
-    - name: Assert enable_syslog_only_check
-      ansible.builtin.assert:
-        that:
-          - enable_syslog_only_check.data.rules.1.syslog_enabled == True
-          - enable_syslog_only_check is changed
-
-    - name: Query firewall rules
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Debug query.data.rules.1
-      ansible.builtin.debug:
-        msg: "{{query.data.rules.1}}"
-
-    - name: Assert query.data and disable_syslog
-      ansible.builtin.assert:
-        that:
-          - query.data.rules.1.syslog_enabled == False
-          - disable_syslog.changed == True
-
-  always:
-    - name: Delete all firewall rules
-      cisco.meraki.meraki_mx_l3_firewall:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: present
-        rules: []
-      delegate_to: localhost
-      register: delete_all
-
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: "{{ auth_key }}"
-        org_name: "{{ test_org_name }}"
-        net_name: TestNetAppliance
-        state: absent
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_l7_firewall/tasks/main.yml b/tests/integration/targets/meraki_mx_l7_firewall/tasks/main.yml
deleted file mode 100644
index bb4c6fc59..000000000
--- a/tests/integration/targets/meraki_mx_l7_firewall/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
\ No newline at end of file
diff --git a/tests/integration/targets/meraki_mx_l7_firewall/tasks/tests.yml b/tests/integration/targets/meraki_mx_l7_firewall/tasks/tests.yml
deleted file mode 100644
index 875f24520..000000000
--- a/tests/integration/targets/meraki_mx_l7_firewall/tasks/tests.yml
+++ /dev/null
@@ -1,524 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  # - name: Test an API key is provided
-  #   fail:
-  #     msg: Please define an API key
-  #   when: auth_key is not defined
-    
-  # - name: Create network
-  #   meraki_network:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{test_org_name}}'
-  #     net_name: TestNetAppliance
-  #     state: present
-  #     type: appliance
-
-  # - name: Query firewall rules
-  #   meraki_mx_l7_firewall:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{test_org_name}}'
-  #     net_name: TestNetAppliance
-  #     state: query
-  #   register: query
-
-  # - assert:
-  #     that:
-  #       - query.data is defined
-
-  # - name: Query firewall application categories
-  #   meraki_mx_l7_firewall:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{test_org_name}}'
-  #     net_name: TestNetAppliance
-  #     state: query
-  #     categories: yes
-  #   register: query_categories
-
-  # - assert:
-  #     that:
-  #       - query_categories.data is defined
-
-  # - name: Set firewall rules to empty array
-  #   meraki_mx_l7_firewall:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{test_org_name}}'
-  #     net_name: TestNetAppliance
-  #     state: present
-  #     rules: []
-  #   register: empty_list
-
-  # - debug:
-  #     var: empty_list
-
-  # - assert:
-  #     that:
-  #       - empty_list.data.rules | length == 0
-
-  - name: Set firewall rules to empty array with idempotency
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules: []
-    register: empty_list_idempotent
-
-  - debug:
-      var: empty_list_idempotent
-
-  - assert:
-      that:
-        - empty_list_idempotent.data.rules | length == 0
-        - empty_list_idempotent is not changed
-
-  - name: Create firewall rule for IP range in check mode
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_check
-    check_mode: yes
-
-  - debug:
-      var: create_ip_range_check
-
-  - assert:
-      that:
-        - create_ip_range_check is changed
-
-  - name: Create firewall rule for IP range
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24 
-    register: create_ip_range
-
-  - debug:
-      var: create_ip_range
-
-  - assert:
-      that:
-        - create_ip_range is changed
-        - create_ip_range.data.rules | length == 1
-
-  - name: Create firewall rule for IP range with idempotency with check mode
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent_check
-    check_mode: yes
-
-  - assert:
-      that:
-        - create_ip_range_idempotent_check is not changed
-
-  - name: Create firewall rule for IP range with idempotency
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent
-
-  - assert:
-      that:
-        - create_ip_range_idempotent is not changed
-
-  - name: Create firewall rule for IP and port
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.1:23
-    register: create_ip_range_port
-
-  - debug:
-      var: create_ip_range_port
-
-  - assert:
-      that:
-        - create_ip_range_port is changed
-
-  - name: Create firewall rule for IP range
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24 
-    register: create_ip_range
-
-  - debug:
-      var: create_ip_range
-
-  - assert:
-      that:
-        - create_ip_range is changed
-        - create_ip_range.data.rules | length == 1
-
-  - name: Create firewall rule for IP range with idempotency with check mode
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent_check
-    check_mode: yes
-
-  - assert:
-      that:
-        - create_ip_range_idempotent_check is not changed
-
-  - name: Create firewall rule for IP range with idempotency
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: ip_range
-          ip_range: 10.11.12.0/24
-    register: create_ip_range_idempotent
-
-  - assert:
-      that:
-        - create_ip_range_idempotent is not changed
-
-  - name: Create firewall rule for application
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application
-          application:
-            name: facebook
-    register: application_rule
-
-  - assert:
-      that:
-        - application_rule is changed
-        - application_rule.data.rules is defined
-
-  - name: Create firewall rule for application via ID
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application
-          application:
-            id: meraki:layer7/application/205
-    register: application_rule_id
-
-  - assert:
-      that:
-        - application_rule_id is changed
-
-  - name: Create firewall rule for invalid application
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application
-          application:
-            name: ansible
-    register: application_rule_invalid
-    ignore_errors: yes
-
-  - name: Create firewall rule for application category
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application_category
-          application:
-            name: Advertising
-    register: application_category_rule
-
-  - debug:
-      var: application_category_rule
-
-  - assert:
-      that:
-        - application_category_rule is changed
-
-  - name: Create firewall rule for application category with ID and conflict
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/27
-    register: application_category_rule_id_conflict
-
-  - assert:
-      that:
-        - application_category_rule_id_conflict is not changed
-
-  - name: Create firewall rule for application category with ID
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/24
-    register: application_category_rule_id
-
-  - assert:
-      that:
-        - application_category_rule_id is changed
-
-  - name: Create firewall rule for host
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: host
-          host: asdf.com
-    register: host_rule
-
-  - assert:
-      that:
-        - host_rule is changed
-
-  - name: Create firewall rule for port
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: port
-          port: 1234
-    register: port_rule
-
-  - assert:
-      that:
-        - port_rule is changed
-
-  - name: Create firewall rule for denied countries
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: blocked_countries
-          countries:
-            - CA
-            - AX
-    register: blocked_countries
-
-  - assert:
-      that:
-        - blocked_countries is changed
-
-  - name: Create firewall rule for allowed countries
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: blocked_countries
-          countries:
-            - US
-            - FR
-    register: allowed_countries
-
-  - assert:
-      that:
-        - allowed_countries is changed
-
-  - name: Create firewall rule for allowed countries with idempotency
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: blocked_countries
-          countries:
-            - US
-            - FR
-    register: allowed_countries_idempotent
-
-  - assert:
-      that:
-        - allowed_countries_idempotent is not changed
-
-  - name: Create multiple firewall rules
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application_category
-          application:
-            id: meraki:layer7/category/27
-        - type: blocked_countries
-          countries:
-            - CN
-        - policy: deny
-          type: port
-          port: 8080
-    register: multiple_rules
-
-  - debug:
-      var: multiple_rules
-
-  - assert:
-      that:
-        - multiple_rules.data.rules | length == 3
-        - multiple_rules is changed
-
-  #########################################
-  ##  Tests for argument completeness    ##
-  #########################################
-
-  - name: Test blocked_countries incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: blocked_countries
-    register: error_allowed
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_allowed.msg == "countries argument is required when type is blocked_countries."'
-
-  - name: Test blocked_countries incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: blocked_countries
-    register: error_denied
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_denied.msg == "countries argument is required when type is blocked_countries."'
-
-  - name: Test application_category incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application_category
-    register: error_app_cat
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_app_cat.msg == "application argument is required when type is application_category."'
-
-  - name: Test application incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: application
-    register: error_app_cat
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_app_cat.msg == "application argument is required when type is application."'
-
-  - name: Test host incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: host
-    register: error_app_cat
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_app_cat.msg == "host argument is required when type is host."'
-
-  - name: Test port incomplete arguments
-    meraki_mx_l7_firewall:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{test_org_name}}'
-      net_name: TestNetAppliance
-      state: present
-      rules:
-        - type: port
-    register: error_app_cat
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - 'error_app_cat.msg == "port argument is required when type is port."'
-
-  #################
-  ##  Cleanup    ##
-  #################
-
-  # always:
-  # - name: Delete network
-  #   meraki_network:
-  #     auth_key: '{{ auth_key }}'
-  #     org_name: '{{test_org_name}}'
-  #     net_name: TestNetAppliance
-  #     state: absent
-  #   delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_malware/tasks/main.yml b/tests/integration/targets/meraki_mx_malware/tasks/main.yml
deleted file mode 100644
index bab98cd0c..000000000
--- a/tests/integration/targets/meraki_mx_malware/tasks/main.yml
+++ /dev/null
@@ -1,253 +0,0 @@
-# Test code for the Meraki VLAN module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Test an API key is provided
-    fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      type: appliance
-    delegate_to: localhost
-    register: net
-
-  - set_fact:
-      net_id: '{{net.data.id}}'
-
-  - name: Enable malware protection with check mode
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-    delegate_to: localhost
-    check_mode: yes
-    register: get_malware_check
-
-  - assert:
-      that:
-        - get_malware_check is changed
-        - get_malware_check.data is defined
-
-  - name: Enable malware protection
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-    delegate_to: localhost
-    register: get_malware
-
-  - debug:
-      var: get_malware
-
-  - assert:
-      that:
-        - get_malware is changed
-        - get_malware.data.mode is defined
-
-  - name: Enable malware protection with idempotency
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-    delegate_to: localhost
-    register: get_malware_idempotent
-
-  - debug:
-      var: get_malware_idempotent
-
-  - assert:
-      that:
-        - get_malware_idempotent is not changed
-        - get_malware_idempotent.data is defined
-
-  - name: Test error when mode is not set
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      allowed_files:
-        - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
-          comment: random zip
-    delegate_to: localhost
-    register: test_mode_err
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - test_mode_err.msg == "mode must be set when allowed_files or allowed_urls is set."
-
-  - name: Set whitelisted file with check mode
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-      allowed_files:
-        - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
-          comment: random zip
-    delegate_to: localhost
-    check_mode: yes
-    register: set_file_check
-
-  - debug:
-      var:
-        set_file_check
-
-  - assert:
-      that:
-        - set_file_check is changed
-        - set_file_check.data is defined
-
-  - name: Set whitelisted file
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{net_id}}'
-      mode: enabled
-      allowed_files:
-        - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
-          comment: random zip
-    delegate_to: localhost
-    register: set_file
-
-  - debug:
-      var: set_file
-
-  - assert:
-      that:
-        - set_file is changed
-        - set_file.data.mode is defined
-
-  - name: Set whitelisted file with idempotency
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-      allowed_files:
-        - sha256: e82c5f7d75004727e1f3b94426b9a11c8bc4c312a9170ac9a73abace40aef503
-          comment: random zip
-    delegate_to: localhost
-    register: set_file_idempotent
-
-  - debug:
-      var: set_file_idempotent
-
-  - assert:
-      that:
-        - set_file_idempotent is not changed
-        - set_file_idempotent.data is defined
-
-  - name: Set whitelisted url with check mode
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-      allowed_urls:
-        - url: www.ansible.com
-          comment: Ansible
-        - url: www.google.com
-          comment: Google
-    delegate_to: localhost
-    check_mode: yes
-    register: set_url_check
-
-  - debug:
-      var:
-        set_url_check
-
-  - assert:
-      that:
-        - set_url_check is changed
-        - set_url_check.data is defined
-
-  - name: Set whitelisted url
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-      allowed_urls:
-        - url: www.ansible.com
-          comment: Ansible
-        - url: www.google.com
-          comment: Google
-    delegate_to: localhost
-    register: set_url
-
-  - debug:
-      var: set_url
-
-  - assert:
-      that:
-        - set_url is changed
-        - set_url.data.mode is defined
-
-  - name: Set whitelisted url with idempotency
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-      mode: enabled
-      allowed_urls:
-        - url: www.ansible.com
-          comment: Ansible
-        - url: www.google.com
-          comment: Google
-    delegate_to: localhost
-    register: set_url_idempotent
-
-  - debug:
-      var: set_url_idempotent
-
-  - assert:
-      that:
-        - set_url_idempotent is not changed
-        - set_url_idempotent.data is defined
-
-  - name: Get malware settings
-    meraki_malware:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-    delegate_to: localhost
-    register: get_malware
-
-  - assert:
-      that:
-        - get_malware.data is defined
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-  always:
-  - name: Delete test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Malware'
-    delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_nat/tasks/main.yml b/tests/integration/targets/meraki_mx_nat/tasks/main.yml
deleted file mode 100644
index 721a93007..000000000
--- a/tests/integration/targets/meraki_mx_nat/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
diff --git a/tests/integration/targets/meraki_mx_nat/tasks/tests.yml b/tests/integration/targets/meraki_mx_nat/tasks/tests.yml
deleted file mode 100644
index 11193d135..000000000
--- a/tests/integration/targets/meraki_mx_nat/tasks/tests.yml
+++ /dev/null
@@ -1,363 +0,0 @@
-# Test code for the Meraki NAT module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      type: appliance
-
-  - name: Create 1:1 rule with check mode
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_one:
-        - name: Service behind NAT
-          public_ip: 1.2.1.2
-          lan_ip: 192.168.128.1
-          uplink: internet1
-          allowed_inbound:
-            - protocol: tcp
-              destination_ports:
-                - 80
-              allowed_ips: 
-                - 10.10.10.10
-    register: create_one_one_check
-    check_mode: yes
-
-  - debug:
-      var: create_one_one_check
-
-  - assert:
-      that:
-        - create_one_one_check is changed
-
-  - name: Create 1:1 rule
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_one:
-        - name: Service behind NAT
-          public_ip: 1.2.1.2
-          lan_ip: 192.168.128.1
-          uplink: internet1
-          allowed_inbound:
-            - protocol: tcp
-              destination_ports:
-                - 80
-              allowed_ips: 
-                - 10.10.10.10
-    register: create_one_one
-
-  - debug:
-      var: create_one_one
-
-  - assert:
-      that:
-        - create_one_one is changed
-
-  - name: Create 1:1 rule with idempotency
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_one:
-        - name: Service behind NAT
-          public_ip: 1.2.1.2
-          lan_ip: 192.168.128.1
-          uplink: internet1
-          allowed_inbound:
-            - protocol: tcp
-              destination_ports:
-                - 80
-              allowed_ips: 
-                - 10.10.10.10
-    register: create_one_one_idempotent
-
-  - debug:
-      var: create_one_one_idempotent
-
-  - assert:
-      that:
-        - create_one_one_idempotent is not changed
-
-  - name: Create 1:many rule with check mode
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_many:
-        - public_ip: 1.1.1.1
-          uplink: internet1
-          port_rules:
-            - name: Test rule
-              protocol: tcp
-              public_port: 10
-              local_ip: 192.168.128.1
-              local_port: 11
-              allowed_ips:
-                - any
-    register: create_one_many_check
-    check_mode: yes
-
-  - debug:
-      var: create_one_many_check
-
-  - assert:
-      that:
-        - create_one_many_check is changed
-
-  - name: Create 1:many rule
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_many:
-        - public_ip: 1.1.1.1
-          uplink: internet1
-          port_rules:
-            - name: Test rule
-              protocol: tcp
-              public_port: 10
-              local_ip: 192.168.128.1
-              local_port: 11
-              allowed_ips:
-                - any
-    register: create_one_many
-
-  - debug:
-      var: create_one_many
-
-  - assert:
-      that:
-        - create_one_many is changed
-
-  - name: Create 1:many rule with idempotency
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      one_to_many:
-        - public_ip: 1.1.1.1
-          uplink: internet1
-          port_rules:
-            - name: Test rule
-              protocol: tcp
-              public_port: 10
-              local_ip: 192.168.128.1
-              local_port: 11
-              allowed_ips:
-                - any
-    register: create_one_many_idempotent
-
-  - debug:
-      var: create_one_many_idempotent
-
-  - assert:
-      that:
-        - create_one_many_idempotent is not changed
-
-  - name: Create port forwarding rule with check mode
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      port_forwarding:
-        - name: Test map
-          lan_ip: 192.168.128.1
-          uplink: both
-          protocol: tcp
-          allowed_ips:
-            - 1.1.1.1
-          public_port: 10
-          local_port: 11
-    register: create_pf_check
-    check_mode: yes
-
-  - debug:
-      var: create_pf_check
-
-  - assert:
-      that:
-        - create_pf_check is changed
-
-  - name: Create port forwarding rule
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      port_forwarding:
-        - name: Test map
-          lan_ip: 192.168.128.1
-          uplink: both
-          protocol: tcp
-          allowed_ips:
-            - 1.1.1.1
-          public_port: 10
-          local_port: 11
-    register: create_pf
-
-  - debug:
-      var: create_pf
-
-  - assert:
-      that:
-        - create_pf is changed
-
-  - name: Create port forwarding rule with idempotency
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      port_forwarding:
-        - name: Test map
-          lan_ip: 192.168.128.1
-          uplink: both
-          protocol: tcp
-          allowed_ips:
-            - 1.1.1.1
-          public_port: 10
-          local_port: 11
-    register: create_pf_idempotent
-
-  - debug:
-      var: create_pf_idempotent
-
-  - assert:
-      that:
-        - create_pf_idempotent is not changed
-        - create_pf_idempotent.data.port_forwarding is defined
-
-  - name: Create multiple rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: present
-      port_forwarding:
-        - name: Test map
-          lan_ip: 192.168.128.1
-          uplink: both
-          protocol: tcp
-          allowed_ips:
-            - 1.1.1.2
-          public_port: 10
-          local_port: 11
-      one_to_many:
-        - public_ip: 1.1.1.3
-          uplink: internet1
-          port_rules:
-            - name: Test rule
-              protocol: tcp
-              public_port: 10
-              local_ip: 192.168.128.1
-              local_port: 11
-              allowed_ips:
-                - any
-    register: create_multiple
-
-  - debug:
-      var: create_multiple
-
-  - assert:
-      that:
-        - create_multiple is changed
-        - create_multiple.data.one_to_many is defined
-        - create_multiple.data.port_forwarding is defined
-
-  - assert:
-      that:
-        - create_multiple is changed
-        - create_multiple.data.one_to_many is defined
-        - create_multiple.data.port_forwarding is defined
-        - create_multiple.diff.before.one_to_many is defined
-        - create_multiple.diff.before.port_forwarding is defined
-        - create_multiple.diff.after.one_to_many is defined
-        - create_multiple.diff.after.port_forwarding is defined
-
-  - name: Query all NAT rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: query
-      subset: all
-    register: query_all
-
-  - debug:
-      var: query_all
-
-  - name: Query 1:1 NAT rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: query
-      subset: '1:1'
-    register: query_1to1
-
-  - debug:
-      var: query_1to1
-
-  - name: Query 1:many NAT rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: query
-      subset: '1:many'
-    register: query_1tomany
-
-  - debug:
-      var: query_1tomany
-
-  - name: Query port forwarding rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: query
-      subset: port_forwarding
-    register: query_pf
-
-  - debug:
-      var: query_pf
-
-  - name: Query multiple rules
-    meraki_nat:
-      auth_key: '{{auth_key}}'
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}'
-      state: query
-      subset:
-        - '1:1'
-        - '1:many'
-    register: query_multiple
-
-  - debug:
-      var: query_multiple
-
-  always:
-    - name: Delete test network
-      meraki_network:
-        auth_key: '{{auth_key}}'
-        org_name: '{{test_org_name}}'
-        net_name: '{{test_net_name}}'
-        state: absent
-  
\ No newline at end of file
diff --git a/tests/integration/targets/meraki_mx_network_vlan_settings/tasks/main.yml b/tests/integration/targets/meraki_mx_network_vlan_settings/tasks/main.yml
deleted file mode 100644
index 4fd4b863a..000000000
--- a/tests/integration/targets/meraki_mx_network_vlan_settings/tasks/main.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2020, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create network with type appliance
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-      type: appliance
-      timezone: America/Chicago
-    delegate_to: localhost
-
-  - name: Get VLAN settings
-    meraki_mx_network_vlan_settings:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-    delegate_to: localhost
-    register: query_all
-
-  - debug:
-      var: query_all
-
-  - name: Enable VLANs on network with check mode
-    meraki_mx_network_vlan_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-      vlans_enabled: yes
-    delegate_to: localhost
-    register: enable_vlans_check
-    check_mode: yes
-
-  - debug:
-      var: enable_vlans_check
-
-  - assert:
-      that:
-        - enable_vlans_check is changed
-        - enable_vlans_check.data.vlans_enabled == true
-
-  - name: Enable VLANs on network
-    meraki_mx_network_vlan_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-      vlans_enabled: yes
-    delegate_to: localhost
-    register: enable_vlans
-
-  - debug:
-      var: enable_vlans
-
-  - assert:
-      that:
-        - enable_vlans is changed
-        - enable_vlans.data.vlans_enabled == true
-
-  - name: Enable VLANs on network idempotent
-    meraki_mx_network_vlan_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-      vlans_enabled: yes
-    delegate_to: localhost
-    register: enable_vlans_idempotent
-
-  - debug:
-      var: enable_vlans_idempotent
-
-  - assert:
-      that:
-        - enable_vlans_idempotent is not changed
-        - enable_vlans_idempotent.data.vlans_enabled == true
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-
-  always:
-  - name: Delete network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-    delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_site_to_site_firewall/tasks/main.yml b/tests/integration/targets/meraki_mx_site_to_site_firewall/tasks/main.yml
deleted file mode 100644
index eedbc4ff4..000000000
--- a/tests/integration/targets/meraki_mx_site_to_site_firewall/tasks/main.yml
+++ /dev/null
@@ -1,373 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run tests against meraki_mx_site_to_site_firewall
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: TestNetAppliance
-        state: present
-        type: appliance
-      delegate_to: localhost
-
-    - name: Test issue 302
-      cisco.meraki.meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        syslog_default_rule: true
-        rules:
-          - comment: Block All telnet Traffic Rename
-            src_cidr: 192.0.2.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32
-            dest_port: 23, 22
-            protocol: tcp
-            policy: deny
-            syslog_enabled: true
-
-          - comment: Allow Middle Rule
-            src_cidr: 192.0.1.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32
-            dest_port: 9443, 8080
-            protocol: tcp
-            policy: allow
-            syslog_enabled: true
-
-          - comment: Allow Web traffic
-            src_cidr: 192.0.1.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32
-            dest_port: 80, 443, 8443
-            protocol: tcp
-            policy: allow
-            syslog_enabled: true
-      delegate_to: localhost
-      register: threeohtwo_original
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - threeohtwo_original.data is defined
-          - threeohtwo_original.data.rules[0].comment == "Block All telnet Traffic Rename"
-          - threeohtwo_original.data.rules[1].comment == "Allow Middle Rule"
-          - threeohtwo_original.data.rules[2].comment == "Allow Web traffic"
-          - threeohtwo_original.data.rules[0].dest_cidr == "192.0.2.2/32"
-
-    - name: Update rules to test 302
-      cisco.meraki.meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        syslog_default_rule: true
-        rules:
-          - comment: Block All telnet Traffic Rename
-            src_cidr: 192.0.2.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32, 192.0.3.0/24
-            dest_port: 23, 22
-            protocol: tcp
-            policy: deny
-            syslog_enabled: true
-
-          - comment: Allow Web traffic
-            src_cidr: 192.0.1.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32
-            dest_port: 80, 443, 8443
-            protocol: tcp
-            policy: allow
-            syslog_enabled: true
-
-          - comment: Allow Middle Rule
-            src_cidr: 192.0.1.0/24
-            src_port: any
-            dest_cidr: 192.0.2.2/32
-            dest_port: 9443, 8080
-            protocol: tcp
-            policy: allow
-            syslog_enabled: true
-      delegate_to: localhost
-      register: threeohtwo_update
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - threeohtwo_update.data is defined
-          - threeohtwo_update.data.rules[0].comment == "Block All telnet Traffic Rename"
-          - threeohtwo_update.data.rules[1].comment == "Allow Web traffic"
-          - threeohtwo_update.data.rules[2].comment == "Allow Middle Rule"
-          - threeohtwo_update.data.rules[0].dest_cidr == "192.0.2.2/32,192.0.3.0/24"
-
-    - name: Test capitalization for protocol
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        syslog_default_rule: true
-        rules:
-          - comment: Block All telnet Traffic Rename
-            src_cidr: 192.0.2.0/24
-            src_port: Any
-            dest_cidr: 192.0.2.2/32, 192.0.3.0/24
-            dest_port: 23, 22
-            protocol: any
-            policy: deny
-            syslog_enabled: true
-      delegate_to: localhost
-      register: protocol_any
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - protocol_any is success
-          - protocol_any is changed
-          - protocol_any.data.rules[0].protocol == "any"
-
-    - name: Query firewall rules
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Set one firewall rule with check mode
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      check_mode: true
-      register: create_one_check
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - create_one_check.data.rules|length == 2
-          - create_one_check.data.rules.0.dest_cidr == '192.0.1.1/32'
-          - create_one_check.data.rules.0.protocol == 'tcp'
-          - create_one_check.data.rules.0.policy == 'deny'
-          - create_one_check is changed
-          - create_one_check.data is defined
-
-    - name: Set one firewall rule
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: create_one
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - create_one.data.rules|length == 2
-          - create_one.data.rules.0.dest_cidr == '192.0.1.1/32'
-          - create_one.data.rules.0.protocol == 'tcp'
-          - create_one.data.rules.0.policy == 'deny'
-          - create_one.changed == True
-          - create_one.data is defined
-
-    - name: Check for idempotency
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: create_one_idempotent
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - create_one_idempotent.changed == False
-          - create_one_idempotent.data is defined
-
-    - name: Update one existing rule
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny all documentation addresses
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32,192.0.1.2/32
-            protocol: tcp
-            policy: deny
-      delegate_to: localhost
-      register: update_one
-
-
-    - name: Enable syslog for default rule with check mode
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: true
-      delegate_to: localhost
-      check_mode: true
-      register: default_syslog_check
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - default_syslog_check.data is defined
-          - default_syslog_check.data.rules.1.syslog_enabled == True
-
-    - name: Enable syslog for default rule
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: true
-      delegate_to: localhost
-      register: default_syslog
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - default_syslog.data is defined
-
-    - name: Query firewall rules
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - query.data.rules.1.syslog_enabled == True
-          - default_syslog.changed == True
-
-    - name: Disable syslog for default rule
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules:
-          - comment: Deny to documentation address
-            src_port: Any
-            src_cidr: Any
-            dest_port: 80,443
-            dest_cidr: 192.0.1.1/32
-            protocol: tcp
-            policy: deny
-        syslog_default_rule: false
-      delegate_to: localhost
-      register: disable_syslog
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - disable_syslog.data is defined
-
-    - name: Query firewall rules
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Enable syslog for default rule with no rules and with check mode
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        syslog_default_rule: true
-      delegate_to: localhost
-      check_mode: true
-      register: enable_syslog_only_check
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - enable_syslog_only_check.data.rules.1.syslog_enabled == True
-          - enable_syslog_only_check is changed
-
-    - name: Query firewall rules
-      meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-      delegate_to: localhost
-      register: query
-
-    - name: Assert previous task is correct
-      ansible.builtin.assert:
-        that:
-          - query.data.rules.1.syslog_enabled == False
-          - disable_syslog.changed == True
-
-  always:
-    - name: Delete all firewall rules
-      cisco.meraki.meraki_mx_site_to_site_firewall:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        rules: []
-      delegate_to: localhost
-      register: delete_all
-
-    - name: Delete network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: TestNetAppliance
-        state: absent
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_site_to_site_vpn/tasks/main.yml b/tests/integration/targets/meraki_mx_site_to_site_vpn/tasks/main.yml
deleted file mode 100644
index 514100c0c..000000000
--- a/tests/integration/targets/meraki_mx_site_to_site_vpn/tasks/main.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-# Test code for the Meraki Admin module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-
-  - name: Create hub network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      type: appliance
-    delegate_to: localhost
-    register: net_hub
-
-  - name: Create spoke network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_spoke'
-      type: appliance
-    delegate_to: localhost
-    register: net_spoke
-
-  - set_fact:
-      net_spoke_id: '{{net_spoke.data.id}}'
-      net_hub_id: '{{net_hub.data.id}}'
-
-
-  - name: Set hub mode in check mode
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      mode: hub
-      subnets:
-        - local_subnet: '192.168.129.0/24'
-          use_vpn: no
-    delegate_to: localhost
-    register: set_hub_check
-    check_mode: true
-
-  - assert:
-      that:
-        - set_hub_check is changed
-        - set_hub_check.data is defined
-
-  - name: Set hub mode in check mode
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-    delegate_to: localhost
-    register: query_result
-  
-  - debug:
-      var: query_result
-
-  - name: Assert check mode made no changes
-    ansible.builtin.assert:
-      that:
-        - query_result.data.subnets[0].local_subnet == "192.168.128.0/24"
-
-  - name: Create static_route
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      name: Test Route
-      subnet: 192.0.1.0/24
-      gateway_ip: 192.168.128.1
-    delegate_to: localhost
-
-  - name: Set hub mode
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      mode: hub
-      subnets:
-        - local_subnet: '192.0.1.0/24'
-          use_vpn: no
-    delegate_to: localhost
-    register: set_hub
-
-  - assert:
-      that:
-        - set_hub is changed
-        - set_hub.data is defined
-
-  - name: Set hub mode with idempotency
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      mode: hub
-    delegate_to: localhost
-    register: set_hub_idempotent
-
-  - assert:
-      that:
-        - set_hub_idempotent is not changed
-        - set_hub_idempotent.data is defined
-
-  - name: Enable subnet on hub network
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-      mode: hub
-      subnets:
-        - local_subnet: '192.168.128.0/24'
-          use_vpn: yes
-    delegate_to: localhost
-    register: enable_hub_subnet
-
-  - assert:
-      that:
-        - enable_hub_subnet is changed
-        - enable_hub_subnet.data is defined
-
-  - name: Set spoke mode
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_spoke'
-      mode: spoke
-      hubs:
-        - hub_id: '{{net_hub_id}}'
-          use_default_route: false
-    delegate_to: localhost
-    register: set_spoke
-
-  - debug:
-      var: set_spoke
-
-  - name: Set spoke configuration
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_spoke'
-      mode: spoke
-      hubs:
-        - hub_id: '{{net_hub_id}}'
-          use_default_route: false
-      subnets:
-        - local_subnet: '192.168.169.0/24'
-          use_vpn: true
-    delegate_to: localhost
-    register: set_spoke
-
-  - debug:
-      var: set_spoke
-
-  - name: Query rules for hub
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_hub'
-    delegate_to: localhost
-    register: query_all_hub
-
-  - debug:
-      var: query_all_hub
-
-  - name: Query rules for spoke
-    meraki_site_to_site_vpn:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}}_spoke'
-    delegate_to: localhost
-    register: query_all_spoke
-
-  - debug:
-      var: query_all_spoke
diff --git a/tests/integration/targets/meraki_mx_static_route/meraki_static_route/tasks/main.yml b/tests/integration/targets/meraki_mx_static_route/meraki_static_route/tasks/main.yml
deleted file mode 100644
index ed902a3d1..000000000
--- a/tests/integration/targets/meraki_mx_static_route/meraki_static_route/tasks/main.yml
+++ /dev/null
@@ -1,210 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create appliance network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      timezone: America/Chicago
-      type: appliance
-    delegate_to: localhost
-    register: net
-
-  - name: Enable VLANs on network
-    meraki_mx_network_vlan_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      vlans_enabled: yes
-    delegate_to: localhost
-
-  - set_fact:
-      net_id: '{{net.data.id}}'
-
-  - name: Initialize static route id list
-    set_fact:
-      route_ids: []
-  
-  - name: Create VLAN
-    meraki_mx_vlan:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      name: "Test VLAN"
-      vlan_id: 2
-      subnet: "192.168.129.0/24"
-      appliance_ip: "192.168.129.2"
-    delegate_to: localhost
-
-  - name: Create static_route
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      name: Test Route
-      subnet: 192.0.1.0/24
-      gateway_ip: 192.168.128.1
-    delegate_to: localhost
-    register: create_route
-
-  - set_fact:
-      route_ids: "{{ route_ids + [create_route.data.id] }}"
-
-  - name: Create static_route with idempotency
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      name: Test Route
-      subnet: 192.0.1.0/24
-      gateway_ip: 192.168.128.1
-    delegate_to: localhost
-    register: create_route_idempotent
-
-  - assert:
-      that:
-        - create_route_idempotent is not changed
-
-  - name: Create second static_route
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      name: Test Route 2
-      subnet: 192.0.2.0/24
-      gateway_ip: 192.168.128.1
-    delegate_to: localhost
-    register: second_create
-
-  - set_fact:
-      route_ids: "{{ route_ids + [second_create.data.id] }}"
-
-  - assert:
-      that:
-        - create_route.changed == True
-        - create_route.data.id is defined
-
-  - name: Update static route
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      route_id: '{{create_route.data.id}}'
-      subnet: 192.0.3.0/24
-      enabled: yes
-      gateway_vlan_id: 1
-    delegate_to: localhost
-    register: update
-
-  - assert:
-      that:
-        - update is changed
-        - update.data.subnet == "192.0.3.0/24"
-        - update.data.gateway_vlan_id == 1
-
-  - name: Query static routes
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-    delegate_to: localhost
-    register: query_all
-
-  - debug:
-      var: query_all
-
-  - assert:
-      that:
-        - query_all.data | length >= 2
-
-  - name: Update static route with idempotency
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      route_id: '{{create_route.data.id}}'
-      name: Test Route
-      gateway_ip: 192.168.128.1
-      subnet: 192.0.3.0/24
-      enabled: yes
-    delegate_to: localhost
-    register: update_idempotent
-
-  - assert:
-      that:
-        - update_idempotent.changed == False
-        - update_idempotent.data is defined
-
-  - name: Update static route with fixed IP assignment and reservation
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      route_id: '{{create_route.data.id}}'
-      fixed_ip_assignments:
-        - mac: aa:bb:cc:dd:ee:ff
-          ip: 192.0.3.11
-          name: WebServer
-      reserved_ip_ranges:
-        - start: 192.168.3.2
-          end: 192.168.3.10
-          comment: Printers
-    delegate_to: localhost
-    register: fixed_ip
-
-  - debug:
-      var: fixed_ip
-
-  - assert:
-      that:
-        - fixed_ip.data.fixed_ip_assignments | length == 1
-        - fixed_ip.data.reserved_ip_ranges | length == 1
-
-
-  - name: Query single static route
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      route_id: '{{create_route.data.id}}'
-    delegate_to: localhost
-    register: query_one
-
-  - assert:
-      that:
-        - query_one.data.name == "Test Route"
-
-  - name: Delete static routes
-    meraki_static_route:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      route_id: '{{item}}'
-    delegate_to: localhost
-    loop: '{{route_ids}}'
-    register: delete_all
-
-  always:
-    - name: Delete appliance network
-      meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{test_org_name}}'
-        net_name: IntTestNetwork
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_third_party_vpn_peers/tasks/main.yml b/tests/integration/targets/meraki_mx_third_party_vpn_peers/tasks/main.yml
deleted file mode 100644
index 9a08b473d..000000000
--- a/tests/integration/targets/meraki_mx_third_party_vpn_peers/tasks/main.yml
+++ /dev/null
@@ -1,319 +0,0 @@
-# Test code for the Meraki Third Party VPN Peer module
-# Copyright: (c) 2022, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Test an API key is provided
-    fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Query all VPN peers with no org_id or org_name
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: query
-    register: query_all
-    ignore_errors: yes
-
-  - assert:
-      that: query_all.msg == "Organization must be specified via org_name or org_id"
-
-  - name: Query all VPN peers
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-    register: query_all
-
-  - assert:
-      that: query_all.data.peers is defined
-
-  - name: Add a VPN peer without name
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-    register: create_one_no_name
-    ignore_errors: yes
-
-  - assert:
-      that: create_one_no_name.msg == "Peer name must be specified"
-
-  - name: Add a VPN peer with check mode
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          ipsec_policies_preset: default
-    register: create_one_check
-    check_mode: yes
-
-  - debug:
-      var: create_one_check
-
-  - assert:
-      that:
-        - create_one_check is changed
-        - create_one_check.data is defined
-        - create_one_check.data.peers.0.name == "Test peer"
-        - create_one_check.data.peers.0.public_ip == "198.51.100.1"
-        - create_one_check.data.peers.0.private_subnets.0 == "192.0.2.0/24"
-        - create_one_check.data.peers.0.ike_version == "2"
-        - create_one_check.data.peers.0.ipsec_policies_preset == "default"
-
-  - name: Add a VPN peer
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          ipsec_policies_preset: default
-    register: create_one
-
-  - assert:
-      that:
-        - create_one is changed
-        - create_one.data is defined
-        - create_one.data.peers.0.name == "Test peer"
-        - create_one.data.peers.0.public_ip == "198.51.100.1"
-        - create_one.data.peers.0.private_subnets.0 == "192.0.2.0/24"
-        - create_one.data.peers.0.ike_version == "2"
-        - create_one.data.peers.0.ipsec_policies_preset == "default"
-
-  - name: Add a VPN peer with idempotency
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          ipsec_policies_preset: default
-    register: create_one_idempotent
-
-  - assert:
-      that:
-        - create_one_idempotent is not changed
-        - create_one_idempotent.data is defined
-        - create_one_idempotent.data.peers.0.name == "Test peer"
-        - create_one_idempotent.data.peers.0.public_ip == "198.51.100.1"
-        - create_one_idempotent.data.peers.0.private_subnets.0 == "192.0.2.0/24"
-        - create_one_idempotent.data.peers.0.ike_version == "2"
-        - create_one_idempotent.data.peers.0.ipsec_policies_preset == "default"
-
-  - name: Change peer to use network tags
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          network_tags:
-            - none
-          ipsec_policies_preset: default
-    register: add_network_tags
-
-  - assert:
-      that:
-        - add_network_tags is changed
-        - add_network_tags.data.peers.0.network_tags.0 == "none"
-
-  - name: Change peer to use network tags with idempotency
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          network_tags:
-            - none
-          ipsec_policies_preset: default
-    register: add_network_tags_idempotent
-
-  - assert:
-      that:
-        - add_network_tags_idempotent is not changed
-        - add_network_tags_idempotent.data.peers.0.network_tags.0 == "none"
-
-
-  - name: Set IPsec policies
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          network_tags:
-            - none
-          remote_id: "192.0.2.0"
-          ipsec_policies:
-            child_lifetime: 600
-            ike_lifetime: 600
-            child_auth_algo:
-              - "md5"
-            child_cipher_algo:
-              - "tripledes"
-              - "aes192"
-            child_pfs_group:
-              - "disabled"
-            ike_auth_algo:
-              - "sha256"
-            ike_cipher_algo:
-              - "tripledes"
-            ike_diffie_hellman_group:
-              - "group2"
-            ike_prf_algo:
-              - "prfmd5"
-    register: set_ipsec_policies
-
-  - assert:
-      that:
-        - set_ipsec_policies is changed
-        - set_ipsec_policies.data.peers.0.ipsec_policies.child_lifetime == 600
-        - set_ipsec_policies.data.peers.0.ipsec_policies.ike_lifetime == 600
-        - set_ipsec_policies.data.peers.0.ipsec_policies.child_auth_algo.0 == "md5"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.child_cipher_algo.0 == "tripledes"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.child_pfs_group.0 == "disabled"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.ike_auth_algo.0 == "sha256"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.ike_cipher_algo.0 == "tripledes"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.ike_diffie_hellman_group.0 == "group2"
-        - set_ipsec_policies.data.peers.0.ipsec_policies.ike_prf_algo.0 == "prfmd5"
-
-  - name: Set IPsec policies with idempotency
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          network_tags:
-            - none
-          remote_id: "192.0.2.0"
-          ipsec_policies:
-            child_lifetime: 600
-            ike_lifetime: 600
-            child_auth_algo:
-              - "md5"
-            child_cipher_algo:
-              - "tripledes"
-              - "aes192"
-            child_pfs_group:
-              - "disabled"
-            ike_auth_algo:
-              - "sha256"
-            ike_cipher_algo:
-              - "tripledes"
-            ike_diffie_hellman_group:
-              - "group2"
-            ike_prf_algo:
-              - "prfmd5"
-    register: set_ipsec_policies_idempotent
-
-  - assert:
-      that:
-        - set_ipsec_policies_idempotent is not changed
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.child_lifetime == 600
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.ike_lifetime == 600
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.child_auth_algo.0 == "md5"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.child_cipher_algo.0 == "tripledes"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.child_pfs_group.0 == "disabled"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.ike_auth_algo.0 == "sha256"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.ike_cipher_algo.0 == "tripledes"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.ike_diffie_hellman_group.0 == "group2"
-        - set_ipsec_policies_idempotent.data.peers.0.ipsec_policies.ike_prf_algo.0 == "prfmd5"
-
-
-  - name: Add a second VPN peer
-    meraki_mx_third_party_vpn_peers:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      peers:
-        - name: "Test peer"
-          public_ip: "198.51.100.1"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.2.0/24"
-          ike_version: "2"
-          ipsec_policies_preset: default
-        - name: "Test peer 2"
-          public_ip: "198.51.100.2"
-          secret: "s3cret"
-          private_subnets:
-            - "192.0.3.0/24"
-          ike_version: "2"
-          ipsec_policies_preset: default
-    register: create_second
-
-  - assert:
-      that:
-        - create_second is changed
-        - create_second.data.peers | length == 2
-        - create_second.data is defined
-        - create_second.data.peers.0.name == "Test peer"
-        - create_second.data.peers.0.public_ip == "198.51.100.1"
-        - create_second.data.peers.0.private_subnets.0 == "192.0.2.0/24"
-        - create_second.data.peers.0.ike_version == "2"
-        - create_second.data.peers.0.ipsec_policies_preset == "default"
-        - create_second.data is defined
-        - create_second.data.peers.1.name == "Test peer 2"
-        - create_second.data.peers.1.public_ip == "198.51.100.2"
-        - create_second.data.peers.1.private_subnets.0 == "192.0.3.0/24"
-        - create_second.data.peers.1.ike_version == "2"
-        - create_second.data.peers.1.ipsec_policies_preset == "default"
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-  # always:
-  # - name: Delete test network
-  #   meraki_network:
-  #     auth_key: '{{auth_key}}'
-  #     state: absent
-  #     org_name: '{{test_org_name}}'
-  #     net_name: '{{test_net_name}}'
-  #   delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_uplink_bandwidth/tasks/main.yml b/tests/integration/targets/meraki_mx_uplink_bandwidth/tasks/main.yml
deleted file mode 100644
index 1e055256b..000000000
--- a/tests/integration/targets/meraki_mx_uplink_bandwidth/tasks/main.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-# Test code for the Meraki MX Uplink module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Test an API key is provided
-    fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-      type: appliance
-    delegate_to: localhost
-
-  - name: Set MX uplink settings with check mode
-    meraki_mx_uplink:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-      wan1:
-        bandwidth_limits:
-          limit_down: 1000000
-          limit_up: 100
-      cellular:
-        bandwidth_limits:
-          limit_down: 0
-          limit_up: 0
-    delegate_to: localhost
-    register: set_bw_check
-    check_mode: yes
-
-  - debug:
-      var: set_bw_check
-
-  - assert:
-      that:
-        - set_bw_check is changed
-        - set_bw_check.data is defined
-        - set_bw_check.diff is defined
-
-  - name: Set MX uplink settings
-    meraki_mx_uplink_bandwidth:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-      wan1:
-        bandwidth_limits:
-          limit_down: 1000000
-          limit_up: 1000
-      cellular:
-        bandwidth_limits:
-          limit_down: 0
-          limit_up: 0
-    delegate_to: localhost
-    register: set_bw
-
-  - debug:
-      var: set_bw
-
-  - assert:
-      that:
-        - set_bw is changed
-        - set_bw.data is defined
-
-  - name: Set MX uplink settings with idempotency
-    meraki_mx_uplink_bandwidth:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-      wan1:
-        bandwidth_limits:
-          limit_down: 1000000
-          limit_up: 1000
-      cellular:
-        bandwidth_limits:
-          limit_down: 0
-          limit_up: 0
-    delegate_to: localhost
-    register: set_bw_idempotent
-
-  - debug:
-      var: set_bw_idempotent
-
-  - assert:
-      that:
-        - set_bw_idempotent is not changed
-        - set_bw_idempotent.data is defined
-
-  - name: Query MX uplink settings
-    meraki_mx_uplink:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-    delegate_to: localhost
-    register: query_all
-
-  - debug:
-      var: query_all
-
-  - assert:
-      that:
-        - query_all.data is defined
-
-  always:
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-
-  - name: Delete test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_net_name}} - Uplink'
-    delegate_to: localhost
diff --git a/tests/integration/targets/meraki_mx_vlan/tasks/main.yml b/tests/integration/targets/meraki_mx_vlan/tasks/main.yml
deleted file mode 100644
index 13c36564e..000000000
--- a/tests/integration/targets/meraki_mx_vlan/tasks/main.yml
+++ /dev/null
@@ -1,475 +0,0 @@
-# Test code for the Meraki VLAN module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Test an API key is provided
-    fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_name: '{{test_net_name}}'
-      type: appliance
-    delegate_to: localhost
-    register: new_net
-
-  - set_fact:
-      test_net_id: '{{ new_net.data.id }}'
-
-  - name: Enable VLANs on network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      enable_vlans: yes
-    delegate_to: localhost
-
-  - name: Create VLAN in check mode
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.1
-    delegate_to: localhost
-    register: create_vlan_check
-    check_mode: yes
-
-  - debug:
-      var: create_vlan_check
-
-  - assert:
-      that:
-        - create_vlan_check is changed
-
-  - name: Create VLAN
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.1
-    delegate_to: localhost
-    register: create_vlan
-    environment:
-      ANSIBLE_MERAKI_FORMAT: camelcase
-
-  - debug:
-      msg: '{{create_vlan}}'
-
-  - assert:
-      that:
-        - create_vlan.data.id == 2
-        - create_vlan.changed == True
-        - create_vlan.data.networkId is defined
-
-  - name: Update VLAN with check mode
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_check
-    check_mode: yes
-
-  - debug:
-      var: update_vlan_check
-
-  - assert:
-      that:
-        - update_vlan_check is changed
-
-  - name: Update VLAN
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan
-
-  - debug:
-      msg: '{{update_vlan}}'
-
-  - assert:
-      that:
-        - update_vlan.data.appliance_ip == '192.168.250.2'
-        - update_vlan.changed == True
-
-  - name: Update VLAN with idempotency and check mode
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_idempotent_check
-    check_mode: yes
-
-  - debug:
-      var: update_vlan_idempotent_check
-
-  - assert:
-      that:
-        - update_vlan_idempotent_check is not changed
-
-  - name: Update VLAN with idempotency
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_idempotent
-
-  - debug:
-      msg: '{{update_vlan_idempotent}}'
-
-  - assert:
-      that:
-        - update_vlan_idempotent.changed == False
-        - update_vlan_idempotent.data is defined
-
-  - name: Add IP assignments and reserved IP ranges
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-        - mac: "12:34:56:78:90:12"
-          ip: 192.168.250.11
-          name: another_fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-        - start: 192.168.250.100
-          end: 192.168.250.120
-          comment: reserved_range_high
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_add_ip
-
-  - debug:
-      msg: '{{update_vlan_add_ip}}'
-
-  - assert:
-      that:
-        - update_vlan_add_ip.changed == True
-        - update_vlan_add_ip.data.fixed_ip_assignments | length == 2
-        - update_vlan_add_ip.data.reserved_ip_ranges | length == 2
-
-  - name: Remove IP assignments and reserved IP ranges
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_remove_ip
-
-  - debug:
-      msg: '{{update_vlan_remove_ip}}'
-
-  - assert:
-      that:
-        - update_vlan_remove_ip.changed == True
-        - update_vlan_remove_ip.data.fixed_ip_assignments | length == 1
-        - update_vlan_remove_ip.data.reserved_ip_ranges | length == 1
-
-  - name: Update VLAN with idempotency
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: opendns
-    delegate_to: localhost
-    register: update_vlan_idempotent
-
-  - debug:
-      msg: '{{update_vlan_idempotent}}'
-
-  - assert:
-      that:
-        - update_vlan_idempotent.changed == False
-        - update_vlan_idempotent.data is defined
-
-  - name: Update VLAN with list of DNS entries
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      fixed_ip_assignments:
-        - mac: "13:37:de:ad:be:ef"
-          ip: 192.168.250.10
-          name: fixed_ip
-      reserved_ip_range:
-        - start: 192.168.250.10
-          end: 192.168.250.20
-          comment: reserved_range
-      dns_nameservers: 1.1.1.1;8.8.8.8
-    delegate_to: localhost
-    register: update_vlan_dns_list
-
-  - debug:
-      msg: '{{update_vlan_dns_list}}'
-
-  - assert:
-      that:
-        - '"1.1.1.1" in update_vlan_dns_list.data.dns_nameservers'
-        - update_vlan_dns_list.changed == True
-
-  - name: Enable DHCP Relay on VLAN
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      dhcp_handling: relay
-      dhcp_relay_server_ips:
-        - 192.168.100.1
-    delegate_to: localhost
-    register: enable_relay
-
-  - debug:
-      var: enable_relay
-
-  - assert:
-      that:
-        - enable_relay is changed
-        - enable_relay.data.dhcp_handling == 'Relay DHCP to another server'
-        - enable_relay.data.dhcp_relay_server_ips[0] == '192.168.100.1'
-
-  - name: Enable DHCP on VLAN
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      dhcp_handling: server
-    delegate_to: localhost
-    register: enable_dhcp
-
-  - debug:
-      var: enable_dhcp
-
-  - assert:
-      that:
-        - enable_dhcp is changed
-        - enable_dhcp.data.dhcp_handling == 'Run a DHCP server'
-
-  - name: Enable DHCP on VLAN with options
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      name: TestVLAN
-      subnet: 192.168.250.0/24
-      appliance_ip: 192.168.250.2
-      dhcp_handling: server
-      dhcp_lease_time: 1 hour
-      dhcp_boot_options_enabled: false
-      dhcp_options:
-        - code: 5
-          type: ip
-          value: 192.0.1.1
-    delegate_to: localhost
-    register: enable_dhcp_options
-
-  - assert:
-      that:
-        - enable_dhcp_options is changed
-        - enable_dhcp_options.data.dhcp_handling == 'Run a DHCP server'
-        - enable_dhcp_options.data.dhcp_options.0.code == '5'
-
-  - name: Query all VLANs in network
-    meraki_vlan:
-      auth_key: '{{ auth_key }}'
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      state: query
-    delegate_to: localhost
-    register: query_vlans
-
-  - debug:
-      msg: '{{query_vlans}}'
-
-  - assert:
-      that:
-        - query_vlans.data | length >= 2
-        - query_vlans.data.1.id == 2
-        - query_vlans.changed == False
-
-  - name: Query single VLAN
-    meraki_vlan:
-      auth_key: '{{ auth_key }}'
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-      state: query
-      output_level: debug
-    delegate_to: localhost
-    register: query_vlan
-
-  - debug:
-      msg: '{{query_vlan}}'
-
-  - assert:
-      that:
-        - query_vlan.data.id == 2
-        - query_vlan.changed == False
-
-  always:
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-  - name: Delete VLAN with check mode
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-    delegate_to: localhost
-    register: delete_vlan_check
-    check_mode: yes
-
-  - assert:
-      that:
-        delete_vlan_check is changed
-
-  - name: Delete VLAN
-    meraki_vlan:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-      vlan_id: 2
-    delegate_to: localhost
-    register: delete_vlan
-
-  - debug:
-      msg: '{{delete_vlan}}'
-
-  - name: Delete test network
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: absent
-      org_id: '{{test_org_id}}'
-      net_id: '{{test_net_id}}'
-    delegate_to: localhost
diff --git a/tests/integration/targets/meraki_network/tasks/main.yml b/tests/integration/targets/meraki_network/tasks/main.yml
deleted file mode 100644
index cc078952f..000000000
--- a/tests/integration/targets/meraki_network/tasks/main.yml
+++ /dev/null
@@ -1,550 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create network without type
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetwork
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_no_type
-    ignore_errors: yes
-
-  - assert:
-      that:
-      - create_net_no_type.msg == 'type parameter is required when creating a network.'
-
-  - name: Create network without organization
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      net_name: IntTestNetwork
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_no_org
-    ignore_errors: yes
-
-  - name: Create network with type switch with check mode
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    check_mode: yes
-    register: create_net_switch_check
-
-  - assert:
-      that:
-        - create_net_switch_check is changed
-        - create_net_switch_check.data is defined
-        - create_net_switch_check.data.organization_id == "{{test_org_id |string}}"
-
-  - name: Create network with type switch
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch
-
-  - set_fact:
-      switch_net_id: '{{ create_net_switch.data.id }}'
-
-  - name: Copy network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitchCopied
-      type: switch
-      copy_from_network_id: '{{ switch_net_id }}'
-    delegate_to: localhost
-    register: copy_from_net_id
-
-  - assert:
-      that:
-        - copy_from_net_id is defined
-        - copy_from_net_id is changed
-        - copy_from_net_id.data.id != create_net_switch.data.id
-
-  - name: Create network with type switch by org ID
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_id: '{{test_org_id}}'
-      net_name: IntTestNetworkSwitchOrgID
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch_org_id  
-    
-  - name: Create network with type appliance and no timezone
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkAppliance
-      type: appliance
-    delegate_to: localhost
-    register: create_net_appliance_no_tz
-
-  - name: Enable VLAN support on appliance network with check mode
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      enable_vlans: yes
-    delegate_to: localhost
-    check_mode: yes
-    register: enable_vlan_check
-
-  - assert:
-      that:
-        - enable_vlan_check.data.vlans_enabled == True
-        - enable_vlan_check is changed
-
-  - name: Enable VLAN support on appliance network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      enable_vlans: yes
-    delegate_to: localhost
-    register: enable_vlan
-
-  - assert:
-      that:
-        - enable_vlan.data.vlans_enabled == True
-
-  - name: Enable VLAN support on appliance network with idempotency
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      enable_vlans: yes
-    delegate_to: localhost
-    register: enable_vlan_idempotent
-
-  - assert:
-      that:
-        - enable_vlan_idempotent is not changed
-        - enable_vlan_idempotent.data is defined
-  
-  - name: Disable VLAN support on appliance network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      enable_vlans: no
-    delegate_to: localhost
-    register: disable_vlan
-
-  - assert:
-      that:
-        - disable_vlan.data.vlans_enabled == False
-
-  - name: Disable VLAN support on appliance network with idempotency
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      enable_vlans: no
-    delegate_to: localhost
-    register: disable_vlan_idempotent
-
-  - assert:
-      that:
-        - disable_vlan_idempotent is not changed
-        - disable_vlan_idempotent.data is defined
-
-  - name: Change local page settings with check mode
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      local_status_page_enabled: False
-    delegate_to: localhost
-    check_mode: True
-    register: disable_local_page_check
-
-  - assert:
-      that:
-        - disable_local_page_check is changed
-
-  - name: Change local page settings
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      local_status_page_enabled: False
-    delegate_to: localhost
-    register: disable_local_page
-
-  - assert:
-      that:
-        - disable_local_page is changed
-        - disable_local_page.data is defined
-
-  - name: Change local page settings with idempotency
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkAppliance
-      local_status_page_enabled: False
-    delegate_to: localhost
-    register: disable_local_page_idempotent
-
-  - assert:
-      that:
-        - disable_local_page_idempotent is not changed
-        - disable_local_page_idempotent.data is defined
-
-  - name: Create network with type wireless
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkWireless
-      type: wireless
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_wireless
-
-  - assert:
-      that:
-        - '"IntTestNetworkWireless" in create_net_wireless.data.name'
-
-  - name: Create network with type wireless and check for idempotency
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkWireless
-      type: wireless
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_wireless_idempotent
-
-  - assert:
-      that:
-        - create_net_wireless_idempotent.changed == False
-        - create_net_wireless_idempotent.data is defined
-
-  - name: Create network with type combined
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: IntTestNetworkCombined
-      type:
-        - appliance
-        - switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_combined
-
-  - assert:
-      that:
-        - create_net_combined.data.product_types | length > 1
-
-  - name: Test status pages - local disabled remote disabled
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkCombined
-      local_status_page_enabled: no
-      remote_status_page_enabled: no
-    delegate_to: localhost
-    register: status_pages_1
-    
-  - assert:
-      that:
-        - status_pages_1.changed == True
-        - status_pages_1['data']['local_status_page_enabled'] == False
-        - status_pages_1['data']['remote_status_page_enabled'] == False
-
-  - name: Test status pages - local enabled remote disabled
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkCombined
-      local_status_page_enabled: yes
-      remote_status_page_enabled: no
-    delegate_to: localhost
-    register: status_pages_2
-    
-  - assert:
-      that:
-        - status_pages_2.changed == True
-        - status_pages_2['data']['local_status_page_enabled'] == True
-        - status_pages_2['data']['remote_status_page_enabled'] == False
-
-  - name: Test status pages - local enabled remote enabled
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkCombined
-      local_status_page_enabled: yes
-      remote_status_page_enabled: yes
-    delegate_to: localhost
-    register: status_pages_3
-    
-  - assert:
-      that:
-        - status_pages_3.changed == True
-        - status_pages_3['data']['local_status_page_enabled'] == True
-        - status_pages_3['data']['remote_status_page_enabled'] == True
-
-  
-  - name: Test status pages - local disabled remote enabled - expected to fail
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkCombined
-      local_status_page_enabled: no
-      remote_status_page_enabled: yes
-    delegate_to: localhost
-    register: status_pages_4
-    ignore_errors: yes
-
-  - assert:
-      that:
-        - status_pages_4.changed == False
-        - '"must be true when setting" in status_pages_4.msg'
-
-  - name: Create network with one tag
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkTag
-      type: switch
-      timezone: America/Chicago
-      tags: first_tag
-    delegate_to: localhost
-    register: create_net_tag
-    
-  - name: Create network with two tags
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkTags
-      type: switch
-      timezone: America/Chicago
-      tags: 
-        - first_tag
-        - second_tag
-    delegate_to: localhost
-    register: create_net_tags
-
-  - set_fact:
-      tag_net_id: '{{create_net_tags.data.id}}'
-
-  - name: Modify network by net_id
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_id: '{{tag_net_id}}'
-      type: switch
-      timezone: America/Chicago
-      tags: 
-        - first_tag
-        - second_tag
-        - third_tag
-    delegate_to: localhost
-    register: create_net_modified
-
-  - name: Modify network with idempotency
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkTags
-      type: switch
-      timezone: America/Chicago
-      tags: 
-        - first_tag
-        - second_tag
-        - third_tag
-    delegate_to: localhost
-    register: create_net_modified_idempotent
-
-  - assert:
-      that:
-        - create_net_modified_idempotent.data is defined
-
-  - name: Present assertions
-    assert:
-      that:
-        - '"org_name or org_id parameters are required" in create_net_no_org.msg'
-        - '"IntTestNetworkAppliance" in create_net_appliance_no_tz.data.name'
-        - create_net_appliance_no_tz.changed == True
-        - '"IntTestNetworkSwitch" in create_net_switch.data.name'
-        - '"IntTestNetworkSwitchOrgID" in create_net_switch_org_id.data.name'
-        - '"first_tag" in create_net_tag.data.tags'
-        - '"second_tag" in create_net_tags.data.tags'
-        - '"third_tag" in create_net_modified.data.tags'
-        - create_net_modified.changed == True
-        - create_net_modified_idempotent.changed == False
-        - create_net_modified_idempotent.data is defined
-
-  - name: Query templated network settings
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_template_name}}'
-      local_status_page_enabled: yes
-    delegate_to: localhost
-    register: query_settings
-
-  - assert:
-      that:
-        - query_settings.data is defined
-
-  - name: Query all networks
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-    delegate_to: localhost
-    register: net_query_all
-      
-  - name: Query a configuration template
-    meraki_network:
-      auth_key: '{{auth_key}}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: '{{test_template_name}}'
-    delegate_to: localhost
-    register: query_config_template
-
-  - name: Query one network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: IntTestNetworkSwitch
-    delegate_to: localhost
-    register: net_query_one
-
-  - name: Query one network - assert
-    assert:
-      that:
-        - 'net_query_one.data.name == "IntTestNetworkSwitch"'
-        - 'query_config_template.data.name == "{{ test_template_name }}"'
-
-  - name: Set net_id
-    ansible.builtin.set_fact:
-      net_id: "{{ net_query_one.data.id }}"
-
-  - name: Query one network by ID
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_id: "{{ net_id}}"
-    delegate_to: localhost
-    register: net_query_one_id
-
-  - name: Query one network by ID - debug
-    ansible.builtin.debug:
-      var: net_query_one_id
-
-  - name: Query one network by ID - assert
-    ansible.builtin.assert:
-      that:
-        - 'net_query_one_id.data.name == "IntTestNetworkSwitch"'
-        - 'query_config_template.data.name == "{{ test_template_name }}"'
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-  always:
-  - name: Delete network without org
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      net_name: IntTestNetworkSwitch
-    delegate_to: localhost
-    register: delete_all_no_org
-    ignore_errors: yes
-      
-  - name: Delete network by org ID and check mode
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_id: '{{test_org_id}}'
-      net_name: IntTestNetworkSwitchOrgID
-    delegate_to: localhost
-    check_mode: yes
-    register: delete_net_org_id_check
-
-  - assert:
-      that:
-        - delete_net_org_id_check is changed
-        - delete_net_org_id_check.data is defined
-      
-  - name: Delete network by org ID
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_id: '{{test_org_id}}'
-      net_name: IntTestNetworkSwitchOrgID
-    delegate_to: localhost
-    register: delete_net_org_id
-
-  - name: Query after delete with org ID
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-    delegate_to: localhost
-    register: query_deleted_org_id
-
-  - name: Delete all networks
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: '{{ item }}'
-    delegate_to: localhost
-    register: delete_all
-    ignore_errors: yes
-    loop:
-      - IntTestNetworkSwitch
-      - IntTestNetworkSwitchCopied
-      - IntTestNetworkWireless
-      - IntTestNetworkAppliance
-      - IntTestNetworkCombined
-      - IntTestNetworkTag
-      - IntTestNetworkTags
-
-  - assert:
-      that:
-        - 'delete_all_no_org.msg == "org_name or org_id parameters are required"'
diff --git a/tests/integration/targets/meraki_network_settings/tasks/main.yml b/tests/integration/targets/meraki_network_settings/tasks/main.yml
deleted file mode 100644
index 9d3783cc6..000000000
--- a/tests/integration/targets/meraki_network_settings/tasks/main.yml
+++ /dev/null
@@ -1,294 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2023, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- block:
-  - name: Create network with type switch
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      type: switch
-      timezone: America/Chicago
-    delegate_to: localhost
-    register: create_net_switch
-
-  - name: Get network settings
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-    delegate_to: localhost
-    register: query_net
-
-  - name: Update network settings with check mode
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: false
-    delegate_to: localhost
-    register: set_local_check
-    check_mode: true
-
-  - name: Assert settings local status page enabled
-    ansible.builtin.assert:
-      that:
-        - set_local_check is changed
-        - set_local_check.data is defined
-        - set_local_check.data.local_status_page_enabled == false
-        - set_local_check.data.password is not defined
-
-  - name: Update network settings
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: false
-    delegate_to: localhost
-    register: set_local
-
-  - name: Assert settings local status page enabled
-    ansible.builtin.assert:
-      that:
-        - set_local is changed
-        - set_local.data is defined
-        - set_local.data.local_status_page_enabled == false
-
-  - name: Update network settings with idempotency
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: false
-    delegate_to: localhost
-    register: set_local_idempotent
-
-  - name: Assert settings local status page enabled with idempotency
-    ansible.builtin.assert:
-      that:
-        - set_local_idempotent is not changed
-        - set_local_idempotent.data is defined
-        - set_local_idempotent.data.local_status_page_enabled == false
-
-  - name: Enable password on local page with check mode
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: true
-      local_status_page:
-        authentication:
-          enabled: true
-          password: abc123
-    delegate_to: localhost
-    register: set_auth_check
-    check_mode: true
-
-  - name: Assert auth settings with check mode
-    ansible.builtin.assert:
-      that:
-        - set_auth_check is changed
-        - set_auth_check.data is defined
-        - set_auth_check.data.local_status_page_enabled == true
-        - set_auth_check.data.local_status_page.authentication.enabled == true
-
-  - name: Enable password on local page
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: true
-      local_status_page:
-        authentication:
-          enabled: true
-          password: abc123
-    delegate_to: localhost
-    register: set_auth
-
-  - debug:
-      var: set_auth
-
-  - name: Assert auth settings
-    ansible.builtin.assert:
-      that:
-        - set_auth is changed
-        - set_auth.data is defined
-        - set_auth.data.local_status_page_enabled == true
-        - set_auth.data.local_status_page.authentication.enabled == true
-      
-  - name: Enable password on local page with idempotency
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: true
-      local_status_page:
-        authentication:
-          enabled: true
-          password: abc123
-    delegate_to: localhost
-    register: set_auth_idempotent
-
-  - name: Assert auth settings with idempotency
-    ansible.builtin.assert:
-      that:
-        - set_auth_idempotent is not changed
-        - set_auth_idempotent.data is defined
-        - set_auth_idempotent.data.local_status_page_enabled == true
-        - set_auth_idempotent.data.local_status_page.authentication.enabled == true
-
-  - name: Enable secure port with check mode
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      secure_port:
-        enabled: true
-    delegate_to: localhost
-    register: set_port_check
-    check_mode: true
-
-  - name: Assert secure port settings with check mode
-    ansible.builtin.assert:
-      that:
-        - set_port_check is changed
-        - set_port_check.data is defined
-        - set_port_check.data.secure_port.enabled == true
-
-  - name: Enable secure port
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      secure_port:
-        enabled: true
-    delegate_to: localhost
-    register: sec_port
-
-  - debug:
-      var: sec_port
-
-  - name: Assert secure port settings
-    ansible.builtin.assert:
-      that:
-        - sec_port is changed
-        - sec_port.data is defined
-        - sec_port.data.secure_port.enabled == true
-        
-  - name: Enable secure port with idempotency
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      secure_port:
-        enabled: true
-    delegate_to: localhost
-    register: sec_port_idempotent
-
-  - debug:
-      var: sec_port_idempotent
-
-  - name: Assert secure port settings with idempotency
-    ansible.builtin.assert:
-      that:
-        - sec_port_idempotent is not changed
-        - sec_port_idempotent.data is defined
-        - sec_port_idempotent.data.secure_port.enabled == true
-
-  - name: Test status pages - local disabled remote disabled
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: no
-      remote_status_page_enabled: no
-    delegate_to: localhost
-    register: status_pages_1
-    
-  - name: Assert status pages - local disabled remote disabled
-    ansible.builtin.assert:
-      that:
-        - status_pages_1.changed == True
-        - status_pages_1['data']['local_status_page_enabled'] == False
-        - status_pages_1['data']['remote_status_page_enabled'] == False
-
-  - name: Test status pages - local enabled remote disabled
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: yes
-      remote_status_page_enabled: no
-    delegate_to: localhost
-    register: status_pages_2
-    
-  - name: Assert status pages - local enabled remote disabled
-    ansible.builtin.assert:
-      that:
-        - status_pages_2.changed == True
-        - status_pages_2['data']['local_status_page_enabled'] == True
-        - status_pages_2['data']['remote_status_page_enabled'] == False
-
-  - name: Test status pages - local enabled remote enabled
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: yes
-      remote_status_page_enabled: yes
-    delegate_to: localhost
-    register: status_pages_3
-    
-  - name: Assert status pages - local enabled remote enabled
-    ansible.builtin.assert:
-      that:
-        - status_pages_3.changed == True
-        - status_pages_3['data']['local_status_page_enabled'] == True
-        - status_pages_3['data']['remote_status_page_enabled'] == True
-
-  
-  - name: Test status pages - local disabled remote enabled - expected to fail
-    cisco.meraki.meraki_network_settings:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-      local_status_page_enabled: no
-      remote_status_page_enabled: yes
-    delegate_to: localhost
-    register: status_pages_4
-    ignore_errors: yes
-
-  - name: Assert status pages - local disabled remote enabled
-    ansible.builtin.assert:
-      that:
-        - status_pages_4.changed == False
-        - '"must be true when setting" in status_pages_4.msg'
-
-#############################################################################
-# Tear down starts here
-#############################################################################
-  always:
-  - name: Delete network
-    meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{test_org_name}}'
-      net_name: NetworkSettingsTestNet
-    delegate_to: localhost
diff --git a/tests/integration/targets/meraki_organization/tasks/main.yml b/tests/integration/targets/meraki_organization/tasks/main.yml
deleted file mode 100644
index ea2323e57..000000000
--- a/tests/integration/targets/meraki_organization/tasks/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  ansible.builtin.include_tasks:
-    file: tests.yml
diff --git a/tests/integration/targets/meraki_organization/tasks/tests.yml b/tests/integration/targets/meraki_organization/tasks/tests.yml
deleted file mode 100644
index 35fb9c088..000000000
--- a/tests/integration/targets/meraki_organization/tasks/tests.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Execute tests for meraki_organiztion
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create a new organization named IntTestOrg
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        org_name: IntTestOrg
-        state: present
-        output_level: debug
-      register: new_org
-
-    - name: Clone IntTestOrg
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        clone: IntTestOrg
-        org_name: IntTestOrgCloned
-        state: present
-      register: cloned_org
-
-    - name: Set cloned network ID
-      ansible.builtin.set_fact:
-        cloned_net_id: '{{ cloned_org.data.id }}'
-
-    - name: Rename IntTestOrg
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        org_name: IntTestOrgRenamed
-        org_id: '{{ new_org.data.id }}'
-        state: present
-      register: modify_org
-
-    - name: Set renamed organization ID
-      ansible.builtin.set_fact:
-        renamed_org_id: '{{ modify_org.data.id }}'
-
-    - name: Rename IntTestOrg idempotent
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        org_name: IntTestOrgRenamed
-        org_id: '{{ new_org.data.id }}'
-        state: present
-      register: modify_org_idempotent
-
-    - name: Present assertions
-      ansible.builtin.assert:
-        that:
-          - '"https" in new_org.url'
-          - new_org.changed == True
-          - new_org.data.id is defined
-          - cloned_org.changed == True
-          - cloned_org.data.id is defined
-          - modify_org.changed == True
-          - 'modify_org.data.name == "IntTestOrgRenamed"'
-          - modify_org_idempotent.changed == False
-          - modify_org_idempotent.data is defined
-
-    - name: List all organizations
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        state: query
-      register: query_all
-
-    - name: Query information about a single organization named IntTestOrg
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        org_name: IntTestOrgRenamed
-        state: query
-      register: query_org
-
-    - name: Query information about IntTestOrg by organization ID
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        org_id: '{{ query_org.data.id }}'
-        state: query
-      register: query_org_id
-
-    - name: Query assertions
-      ansible.builtin.assert:
-        that:
-          - query_org.data.id is defined
-          - query_all.changed == False
-          - query_all.data | length >= 1
-          - 'query_org.data.name == "IntTestOrgRenamed"'
-          - 'query_org_id.data.id == query_org.data.id'
-
-    - name: Delete without confirmation code
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: IntTestOrgCloned
-      register: delete_no_confirm
-      ignore_errors: true
-
-    - name: Assert deletion error
-      ansible.builtin.assert:
-        that:
-          'delete_no_confirm.msg == "delete_confirm must match the network ID of the network to be deleted."'
-
-  always:
-    - name: Delete cloned organizations with check mode
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: IntTestOrgCloned
-        delete_confirm: '{{ cloned_net_id }}'
-      register: deleted_org_check
-      check_mode: true
-
-    - name: Assert organization deletion changed
-      ansible.builtin.assert:
-        that:
-          - deleted_org_check is changed
-
-    - name: Delete cloned organizations
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: IntTestOrgCloned
-        delete_confirm: '{{ cloned_net_id }}'
-      register: deleted_org
-
-    - name: Delete renamed organization by id
-      cisco.meraki.meraki_organization:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_id: '{{ renamed_org_id }}'
-        delete_confirm: '{{ renamed_org_id }}'
-      register: deleted_org_id
-
-    - name: Assert org_id deletion changed
-      ansible.builtin.assert:
-        that:
-          - deleted_org_id is changed
diff --git a/tests/integration/targets/meraki_snmp/tasks/main.yml b/tests/integration/targets/meraki_snmp/tasks/main.yml
deleted file mode 100644
index 06b78d594..000000000
--- a/tests/integration/targets/meraki_snmp/tasks/main.yml
+++ /dev/null
@@ -1,278 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Execute teests against meraki_snmp
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Create SNMP network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        type: appliance
-      delegate_to: localhost
-      register: new_net
-
-    - name: Set net_id
-      ansible.builtin.set_fact:
-        net_id: new_net.data.id
-
-    - name: Query all SNMP settings
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: query
-      delegate_to: localhost
-      register: snmp_query
-
-    - name: Enable SNMPv2c
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v2c_enabled: true
-      delegate_to: localhost
-      register: snmp_v2_enable
-
-    - name: Assert v2c is enabled
-      ansible.builtin.assert:
-        that:
-          - snmp_v2_enable.data.v2_community_string is defined
-          - snmp_v2_enable.data.v2c_enabled == true
-
-    - name: Disable SNMPv2c
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v2c_enabled: false
-      delegate_to: localhost
-      register: snmp_v2_disable
-
-    - name: Assert v2c is disabled
-      ansible.builtin.assert:
-        that:
-          - snmp_v2_disable.data.v2_community_string is not defined
-          - snmp_v2_disable.data.v2c_enabled == False
-
-    - name: Enable SNMPv2c with org_id
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_id: '{{ test_org_id }}'
-        state: present
-        v2c_enabled: true
-      delegate_to: localhost
-      register: snmp_v2_enable_id
-
-    - name: Assert v2c is enabled with org_id
-      ansible.builtin.assert:
-        that:
-          - snmp_v2_enable_id.data.v2_community_string is defined
-          - snmp_v2_enable_id.data.v2c_enabled == true
-
-    - name: Disable SNMPv2c with org_id
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_id: '{{ test_org_id }}'
-        state: present
-        v2c_enabled: false
-      delegate_to: localhost
-      register: snmp_v2_disable_id
-
-    - name: Assert v2c is disabled with org_id
-      ansible.builtin.assert:
-        that:
-          - snmp_v2_disable_id.data.v2_community_string is not defined
-          - snmp_v2_disable_id.data.v2c_enabled == False
-
-    - name: Enable SNMPv3 with check mode
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: true
-        v3_auth_mode: SHA
-        v3_auth_pass: ansiblepass
-        v3_priv_mode: AES128
-        v3_priv_pass: ansiblepass
-      delegate_to: localhost
-      check_mode: true
-      register: snmp_v3_enable_check
-
-    - name: Assert check mode
-      ansible.builtin.assert:
-        that:
-          - snmp_v3_enable_check.data.v3_enabled == True
-          - snmp_v3_enable_check.changed == True
-
-    - name: Enable SNMPv3
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: true
-        v3_auth_mode: SHA
-        v3_auth_pass: ansiblepass
-        v3_priv_mode: AES128
-        v3_priv_pass: ansiblepass
-      delegate_to: localhost
-      register: snmp_v3_enable
-
-    - name: Assert v3 enabled
-      ansible.builtin.assert:
-        that:
-          - snmp_v3_enable.data.v3_enabled == True
-          - snmp_v3_enable.changed == True
-
-    - name: Check for idempotency
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: true
-        v3_auth_mode: SHA
-        v3_auth_pass: ansiblepass
-        v3_priv_mode: AES128
-        v3_priv_pass: ansiblepass
-      delegate_to: localhost
-      register: snmp_idempotent
-
-    - name: Assert idempotency
-      ansible.builtin.assert:
-        that:
-          - snmp_idempotent.changed == False
-          - snmp_idempotent.data is defined
-
-    - name: Add peer IPs
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: true
-        v3_auth_mode: SHA
-        v3_auth_pass: ansiblepass
-        v3_priv_mode: AES128
-        v3_priv_pass: ansiblepass
-        peer_ips:
-          - 1.1.1.1
-          - 2.2.2.2
-      delegate_to: localhost
-      register: peers
-
-    - name: Assert peer_ips is defined
-      ansible.builtin.assert:
-        that:
-          - peers.data.peer_ips is defined
-
-    - name: Set short password
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: true
-        v3_auth_mode: SHA
-        v3_auth_pass: ansible
-        v3_priv_mode: AES128
-        v3_priv_pass: ansible
-      delegate_to: localhost
-      register: short_password
-      ignore_errors: true
-
-    - name: Assert password length
-      ansible.builtin.assert:
-        that:
-          - '"at least 8" in short_password.msg'
-
-    - name: Set network access type to community string
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        access: community
-        community_string: abc123
-      delegate_to: localhost
-      register: set_net_community
-
-    - name: Assert community string
-      ansible.builtin.assert:
-        that:
-          - set_net_community is changed
-          - set_net_community.data is defined
-
-    - name: Set network access type to username
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        access: users
-        users:
-          - username: ansibleuser
-            passphrase: ansiblepass
-      delegate_to: localhost
-      register: set_net_user
-
-    - name: Assert access type
-      ansible.builtin.assert:
-        that:
-          - set_net_user is changed
-          - set_net_user.data is defined
-
-    - name: Set network access type to none
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        access: none
-      delegate_to: localhost
-      register: set_net_none
-
-    - name: Assert access type of none
-      ansible.builtin.assert:
-        that:
-          - set_net_none is changed
-          - set_net_none.data is defined
-
-    - name: Query network SNMP settings
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: query
-      delegate_to: localhost
-      register: get_net
-
-    - name: Assert query
-      ansible.builtin.assert:
-        that:
-          - get_net.data is defined
-
-  always:
-    - name: Disable SNMPv3
-      cisco.meraki.meraki_snmp:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        state: present
-        v3_enabled: false
-        v3_auth_mode: SHA
-        v3_auth_pass: ansiblepass
-        v3_priv_mode: AES128
-        v3_priv_pass: ansiblepass
-      delegate_to: localhost
-
-    - name: Delete SNMP network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: absent
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_ssid/tasks/main.yml b/tests/integration/targets/meraki_ssid/tasks/main.yml
deleted file mode 100644
index 1f934f6fd..000000000
--- a/tests/integration/targets/meraki_ssid/tasks/main.yml
+++ /dev/null
@@ -1,747 +0,0 @@
-# Test code for the Meraki SSID module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of the test
-  block:
-  - name: Set fact wpa_enable to false
-    ansible.builtin.set_fact:
-      wpa_enabled: false
-
-  - name: Test an API key is provided
-    ansible.builtin.fail:
-      msg: Please define an API key
-    when: auth_key is not defined
-
-  - name: Create test network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      type: wireless
-    register: test_net
-
-  - name: Debug test_net
-    ansible.builtin.debug:
-      msg: '{{ test_net }}'
-
-  - name: Add access points to network
-    cisco.meraki.meraki_device:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      serial: '{{ serial_wireless }}'
-    delegate_to: localhost
-
-  - name: Query all SSIDs
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-    delegate_to: localhost
-    register: query_all
-
-  - name: Enable and name SSID with check mode
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      enabled: true
-    delegate_to: localhost
-    register: enable_name_ssid_check
-    check_mode: true
-
-  - name: Assert enable_name_ssid_check
-    ansible.builtin.assert:
-      that:
-        - enable_name_ssid_check is changed
-        - enable_name_ssid_check.data is defined
-
-  - name: Enable and name SSID
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      enabled: true
-    delegate_to: localhost
-    register: enable_name_ssid
-
-  - name: Debug enable_name_ssid
-    ansible.builtin.debug:
-      msg: '{{ enable_name_ssid }}'
-
-  - name: Assert query_all
-    ansible.builtin.assert:
-      that:
-        - query_all.data | length == 15
-        - query_all.data.0.name == 'TestNetSSID WiFi'
-        - enable_name_ssid.data.name == 'AnsibleSSID'
-
-  - name: Check for idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      enabled: true
-    delegate_to: localhost
-    register: enable_name_ssid_idempotent
-
-  - name: Debug enable_name_ssid_idempotent
-    ansible.builtin.debug:
-      msg: '{{ enable_name_ssid_idempotent }}'
-
-  - name: Assert enable_name_ssid_idempotent
-    ansible.builtin.assert:
-      that:
-        - enable_name_ssid_idempotent.changed == False
-        - enable_name_ssid_idempotent.data is defined
-
-  - name: Set splash portal with sponsor domain
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      splash_page: Sponsored guest
-      splash_guest_sponsor_domains:
-        - "gmail.com"
-    delegate_to: localhost
-    register: splash_guest_sponsor_domain
-
-  - name: Debug splash_guest_sponsor_domain
-    ansible.builtin.debug:
-      msg: '{{ splash_guest_sponsor_domain }}'
-
-  - name: Assert splash_guest_sponsor_domain
-    ansible.builtin.assert:
-      that:
-        - splash_guest_sponsor_domain.changed == true
-        - splash_guest_sponsor_domain.data is defined
-
-  - name: Query one SSIDs
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-    delegate_to: localhost
-    register: query_one
-
-  - name: Debug query_one
-    ansible.builtin.debug:
-      msg: '{{ query_one }}'
-
-  - name: Assert query_one
-    ansible.builtin.assert:
-      that:
-        - query_one.data.name == 'AnsibleSSID'
-
-  - name: Query one SSID with number
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: query
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-    delegate_to: localhost
-    register: query_one_number
-
-  - name: Debug query_one_number
-    ansible.builtin.debug:
-      msg: '{{ query_one_number }}'
-
-  - name: Assert query_one_number
-    ansible.builtin.assert:
-      that:
-        - query_one_number.data.name == 'AnsibleSSID'
-
-  - name: Disable SSID without specifying number
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      enabled: false
-    delegate_to: localhost
-    register: disable_ssid
-
-  - name: Debug disable_ssid
-    ansible.builtin.debug:
-      msg: '{{ disable_ssid.data.enabled }}'
-
-  - name: Assert disable_ssid
-    ansible.builtin.assert:
-      that:
-        - disable_ssid.data.enabled == False
-
-  - name: Enable SSID with number
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-      enabled: true
-    delegate_to: localhost
-    register: enable_ssid_number
-
-  - name: Debug enable_ssid_number
-    ansible.builtin.debug:
-      msg: '{{ enable_ssid_number.data.enabled }}'
-
-  - name: Assert enable_ssid_number
-    ansible.builtin.assert:
-      that:
-        - enable_ssid_number.data.enabled == true
-
-  - name: Configure sponsor portal
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-      splash_page: Sponsored guest
-
-  - name: Set VLAN arg spec
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-      use_vlan_tagging: true
-      visible: true
-      ip_assignment_mode: Bridge mode
-      default_vlan_id: 1
-      ap_tags_vlan_ids:
-        - tags: wifi
-          vlan_id: 2
-    delegate_to: localhost
-    register: set_vlan_arg
-
-  - name: Debug set_vlan_org
-    ansible.builtin.debug:
-      var: set_vlan_arg
-
-  - name: Assert set_vlan_arg
-    ansible.builtin.assert:
-      that: set_vlan_arg is changed
-
-  - name: Set VLAN arg spec
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-      use_vlan_tagging: true
-      visible: true
-      ip_assignment_mode: Bridge mode
-      default_vlan_id: 1
-      ap_tags_vlan_ids:
-        - tags: wifi
-          vlan_id: 2
-    delegate_to: localhost
-    register: set_vlan_arg_idempotent
-
-  - name: Debug set_vlan_arg_idempotent
-    ansible.builtin.debug:
-      var: set_vlan_arg_idempotent
-
-  - name: Assert set_vlan_org_idempotent
-    ansible.builtin.assert:
-      that: set_vlan_arg_idempotent is not changed
-
-  - name: Set PSK
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      psk: abc1234567890
-      encryption_mode: wpa
-    delegate_to: localhost
-    register: psk
-
-  - name: Debug psk
-    ansible.builtin.debug:
-      msg: '{{ psk }}'
-
-  - name: Assert psk
-    ansible.builtin.assert:
-      that:
-        - psk.data.auth_mode == 'psk'
-        - psk.data.encryption_mode == 'wpa'
-        - psk.data.wpa_encryption_mode == 'WPA2 only'
-
-  - name: Set PSK with idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      psk: abc1234567890
-      encryption_mode: wpa
-    delegate_to: localhost
-    register: psk_idempotent
-
-  - name: Debug psk_idempotent
-    ansible.builtin.debug:
-      msg: '{{ psk_idempotent }}'
-
-  - name: Assert psk_idempotent
-    ansible.builtin.assert:
-      that:
-        - psk_idempotent is not changed
-
-  #
-  # Check WPA3 Transition Mode
-  #
-  - name: Set WPA3 Transition Mode
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      psk: abc1234567890
-      encryption_mode: wpa
-      wpa_encryption_mode: WPA3 Transition Mode
-    delegate_to: localhost
-    register: psk_wpa3_transition_mode
-    when: wpa_enabled
-
-  - name: Debug psk_wpa3_transition_mode
-    ansible.builtin.debug:
-      msg: '{{ psk_wpa3_transition_mode }}'
-    when: wpa_enabled
-
-  - name: Assert psk_wpa3_transition_mode
-    ansible.builtin.assert:
-      that:
-        - psk_wpa3_transition_mode.data.auth_mode == 'psk'
-        - psk_wpa3_transition_mode.data.encryption_mode == 'wpa'
-        - psk_wpa3_transition_mode.data.wpa_encryption_mode == 'WPA3 Transition Mode'
-    when: wpa_enabled
-
-  - name: Set WPA3 Transition Mode with Idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      psk: abc1234567890
-      encryption_mode: wpa
-      wpa_encryption_mode: WPA3 Transition Mode
-    delegate_to: localhost
-    register: psk_wpa3_transition_mode_idempotent
-    when: wpa_enabled
-
-  - name: Debug wpa_enabled
-    ansible.builtin.debug:
-      msg: '{{ psk_wpa3_transition_mode_idempotent }}'
-    when: wpa_enabled
-
-  - name: Assert psk_wpa3_transition_mode_idempotent
-    ansible.builtin.assert:
-      that:
-        - psk_wpa3_transition_mode_idempotent is not changed
-    when: wpa_enabled
-
-  - name: Enable click-through splash page
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      splash_page: Click-through splash page
-    delegate_to: localhost
-    register: splash_click
-
-  - name: Debug splash_click
-    ansible.builtin.debug:
-      msg: '{{ splash_click }}'
-
-  - name: Assert splash_click
-    ansible.builtin.assert:
-      that:
-        - splash_click.data.splash_page == 'Click-through splash page'
-
-  - name: Set walled garden
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      walled_garden_enabled: true
-      walled_garden_ranges:
-        - 192.168.0.0/24
-        - '*.ansible.com'
-    delegate_to: localhost
-    register: walled_garden
-
-  - name: Debug walled_garden
-    ansible.builtin.debug:
-      msg: '{{ walled_garden }}'
-
-  - name: Assert walled_garden
-    ansible.builtin.assert:
-      that:
-        - 'walled_garden.data.walled_garden_enabled == true'
-        - walled_garden is changed
-
-  - name: Set walled garden with idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      walled_garden_enabled: true
-      walled_garden_ranges:
-        - 192.168.0.0/24
-        - '*.ansible.com'
-    delegate_to: localhost
-    register: walled_garden_idempotent
-
-  - name: Debug walled_garden_idempotent
-    ansible.builtin.debug:
-      msg: '{{ walled_garden_idempotent }}'
-
-  - name: Assert walled_garden_idempotent
-    ansible.builtin.assert:
-      that:
-        - walled_garden_idempotent.data is defined
-        - walled_garden_idempotent is not changed
-
-  - name: Configure RADIUS servers
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: open-with-radius
-      radius_servers:
-        - host: 192.0.1.200
-          port: 1234
-          secret: abc98765
-    delegate_to: localhost
-    register: set_radius_server
-
-  - name: Debug set_radius_server
-    ansible.builtin.debug:
-      msg: '{{ set_radius_server }}'
-
-  - name: Assert set_radius_server
-    ansible.builtin.assert:
-      that:
-        - set_radius_server.data.radius_servers.0.host == '192.0.1.200'
-
-  - name: Configure RADIUS servers with idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: open-with-radius
-      radius_servers:
-        - host: 192.0.1.200
-          port: 1234
-          secret: abc98765
-    delegate_to: localhost
-    register: set_radius_server_idempotent
-
-  - name: Debug set_radius_server_idempotent
-    ansible.builtin.debug:
-      var: set_radius_server_idempotent
-
-  - name: Assert set_radius_server_idempotent
-    ansible.builtin.assert:
-      that:
-        - set_radius_server_idempotent is not changed
-
-  #################
-  # Error testing #
-  #################
-  - name: Set available on all aps to false without also setting availability tags
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      available_on_all_aps: false
-    delegate_to: localhost
-    register: no_availability_tags
-    failed_when: false
-    changed_when: false
-
-  - name: Debug no_availability_tags
-    ansible.builtin.debug:
-      msg: '{{ no_availability_tags }}'
-
-  - name: Assert no_availability_tags
-    ansible.builtin.assert:
-      that:
-        - no_availability_tags.msg == 'available_on_all_aps is only allowed to be false when ap_availability_tags is defined'
-
-  - name: Set ap availability tags without setting available on all aps to false
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      available_on_all_aps: true
-      ap_availability_tags:
-        - "test"
-    delegate_to: localhost
-    register: available_on_all_aps_true_with_tags
-    failed_when: false
-    changed_when: false
-
-  - name: Debug available_on_all_aps_true_with_tags
-    ansible.builtin.debug:
-      msg: '{{ available_on_all_aps_true_with_tags }}'
-
-  - name: Assert available_on_all_aps_true_with_tags
-    ansible.builtin.assert:
-      that:
-        - available_on_all_aps_true_with_tags.msg == 'ap_availability_tags is only allowed when available_on_all_aps is false'
-
-  - name: Set LAN isolation without Bridge mode
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      ip_assignment_mode: "NAT mode"
-      lan_isolation_enabled: true
-    delegate_to: localhost
-    register: lan_isolation_invalid
-    failed_when: false
-    changed_when: false
-
-  - name: Debug lan_isolation_invalid
-    ansible.builtin.debug:
-      msg: '{{ lan_isolation_invalid }}'
-
-  - name: Assert lan_isolation_invalid
-    ansible.builtin.assert:
-      that:
-        - lan_isolation_invalid.msg == 'lan_isolation_enabled is only allowed when ip_assignment_mode is Bridge mode'
-
-  - name: Set PSK with wrong mode
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: open
-      psk: abc1234
-    delegate_to: localhost
-    register: psk_invalid
-    failed_when: false
-    changed_when: false
-
-  - name: Debug psk_invalid
-    ansible.builtin.debug:
-      msg: '{{ psk_invalid }}'
-
-  - name: Assert psk_invalid
-    ansible.builtin.assert:
-      that:
-        - psk_invalid.msg == 'PSK is only allowed when auth_mode is set to psk'
-
-  - name: Set PSK with invalid encryption mode
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      psk: abc1234
-      encryption_mode: eap
-    delegate_to: localhost
-    register: psk_invalid_mode
-    failed_when: false
-    changed_when: false
-
-  - name: Debug psk_invalid_mode
-    ansible.builtin.debug:
-      msg: '{{ psk_invalid_mode }}'
-
-  - name: Assert psk_invalid_mode
-    ansible.builtin.assert:
-      that:
-        - psk_invalid_mode.msg == 'PSK requires encryption_mode be set to wpa'
-
-  - name: Error for PSK and RADIUS servers
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleSSID
-      auth_mode: psk
-      radius_servers:
-        - host: 192.0.1.200
-          port: 1234
-          secret: abc98765
-    delegate_to: localhost
-    register: err_radius_server_psk
-    failed_when: false
-    changed_when: false
-
-  - name: Debug err_radius_server_psk
-    ansible.builtin.debug:
-      var: err_radius_server_psk
-
-  - name: Assert err_radius_server_psk.msg
-    ansible.builtin.assert:
-      that:
-        - 'err_radius_server_psk.msg == "radius_servers requires auth_mode to be open-with-radius or 8021x-radius"'
-
-  - name: Set VLAN arg without default VLAN error
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      number: 1
-      use_vlan_tagging: true
-      visible: true
-      ip_assignment_mode: Bridge mode
-      ap_tags_vlan_ids:
-        - tags: wifi
-          vlan_id: 2
-    delegate_to: localhost
-    register: set_vlan_arg_err
-    failed_when: false
-    changed_when: false
-
-  - name: Debug set_vlan_arg_err
-    ansible.builtin.debug:
-      var: set_vlan_arg_err
-
-  - name: Assert set_vlan_arg_err.msg
-    ansible.builtin.assert:
-      that:
-        - 'set_vlan_arg_err.msg == "default_vlan_id is required when use_vlan_tagging is True"'
-
-  - name: Create SSID to Test SSID Delete Idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: present
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleIdempotentDeleteSSID
-      enabled: true
-    delegate_to: localhost
-
-  - name: Remove SSID to Test SSID Delete Idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleIdempotentDeleteSSID
-    delegate_to: localhost
-    register: deleted_ssid
-
-  - name: Assert deleted_ssid
-    ansible.builtin.assert:
-      that:
-        - deleted_ssid is changed
-
-  - name: Remove SSID to Test SSID Delete Idempotency
-    cisco.meraki.meraki_mr_ssid:
-      auth_key: '{{ auth_key }}'
-      state: absent
-      org_name: '{{ test_org_name }}'
-      net_name: TestNetSSID
-      name: AnsibleIdempotentDeleteSSID
-    delegate_to: localhost
-    register: deleted_ssid
-
-  - name: Assert deleted_ssid
-    ansible.builtin.assert:
-      that:
-        - deleted_ssid is not changed
-
-  always:
-    - name: Delete SSID with check mode
-      cisco.meraki.meraki_mr_ssid:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: TestNetSSID
-        name: AnsibleSSID
-      delegate_to: localhost
-      register: delete_ssid_check
-      check_mode: true
-
-    - name: Assert delete_ssid_check
-      ansible.builtin.assert:
-        that:
-          - delete_ssid_check is changed
-          - delete_ssid_check.data is defined
-
-    - name: Delete SSID
-      cisco.meraki.meraki_mr_ssid:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: TestNetSSID
-        name: AnsibleSSID
-      delegate_to: localhost
-      register: delete_ssid
-
-    - name: Debug delete_ssid
-      ansible.builtin.debug:
-        msg: '{{ delete_ssid }}'
-
-    - name: Assert delete_ssid
-      ansible.builtin.assert:
-        that:
-          - delete_ssid.data.name == 'Unconfigured SSID 2'
-
-    - name: Delete test network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: TestNetSSID
-      register: delete_net
-
-    - name: Debug delete_net
-      ansible.builtin.debug:
-        msg: '{{ delete_net }}'
diff --git a/tests/integration/targets/meraki_syslog/tasks/main.yml b/tests/integration/targets/meraki_syslog/tasks/main.yml
deleted file mode 100644
index dc62a956b..000000000
--- a/tests/integration/targets/meraki_syslog/tasks/main.yml
+++ /dev/null
@@ -1,235 +0,0 @@
-# Test code for the Meraki Organization module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Execute tasks for syslog module
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-
-    - name: Set test network name
-      ansible.builtin.set_fact:
-        syslog_test_net_name: 'syslog_{{ test_net_name }}'
-
-    - name: Create network with type appliance and switch
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        type:
-          - appliance
-          - wireless
-      delegate_to: localhost
-      register: new_net
-
-    - name: Set net_id
-      ansible.builtin.set_fact:
-        net_id: '{{ new_net.data.id }}'
-
-    - name: Query syslog settings
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: query
-      delegate_to: localhost
-      register: query_all
-
-    - name: Set syslog server
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.2
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-      delegate_to: localhost
-      register: create_server
-
-    - name: Assert host IP address
-      ansible.builtin.assert:
-        that:
-          - create_server['data']['servers'][0]['host'] == "192.0.1.2"
-          - create_server is changed
-
-    - name: Set syslog server with idempotency
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.2
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-      delegate_to: localhost
-      register: create_server_idempotency
-
-    - name: Assert idempotency
-      ansible.builtin.assert:
-        that:
-          - create_server_idempotency.changed == False
-          - create_server_idempotency.data is defined
-
-    - name: Set syslog server with wireless Event log
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.2
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-              - wireless Event log
-      delegate_to: localhost
-      register: create_server
-
-    - name: Assert host IP address
-      ansible.builtin.assert:
-        that:
-          - create_server['data']['servers'][0]['host'] == "192.0.1.2"
-          - create_server is changed
-
-    - name: Set syslog server with wireless Event log with idempotency
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.2
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-              - wireless event log
-      delegate_to: localhost
-      register: create_server_idempotency
-
-    - name: Assert idempotency
-      ansible.builtin.assert:
-        that:
-          - create_server_idempotency.changed == False
-          - create_server_idempotency.data is defined
-
-    - name: Set syslog servers to address bug 288
-      cisco.meraki.meraki_syslog:
-        auth_key: "{{ auth_key }}"
-        state: present
-        org_name: "{{ test_org_name }}"
-        net_name: "{{ test_net_name }}"
-        servers:
-          - host: "10.3.15.11"
-            port: 604
-            roles:
-              - Appliance event log
-              - Security events
-          - host: "10.5.15.11"
-            port: 604
-            roles:
-              - Appliance event log
-              - Security events
-          - host: "10.9.15.11"
-            port: 604
-            roles:
-              - Appliance event log
-              - Security events
-          - host: "10.5.250.12"
-            port: 514
-            roles:
-              - Appliance event log
-              - Security events
-
-    - name: Set multiple syslog servers
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net_id }}'
-        state: present
-        servers:
-          - host: 192.0.1.3
-            port: 514
-            roles:
-              - Appliance event log
-          - host: 192.0.1.4
-            port: 514
-            roles:
-              - Appliance event log
-              - Flows
-          - host: 192.0.1.5
-            port: 514
-            roles:
-              - Flows
-      delegate_to: localhost
-      register: create_multiple_servers
-
-    - name: Assert valid servers
-      ansible.builtin.assert:
-        that:
-          - create_multiple_servers['data']['servers'][0]['host'] == "192.0.1.3"
-          - create_multiple_servers['data']['servers'][1]['host'] == "192.0.1.4"
-          - create_multiple_servers['data']['servers'][2]['host'] == "192.0.1.5"
-          - create_multiple_servers['data']['servers'] | length == 3
-
-    - name: Create syslog server with bad name
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.6
-            port: 514
-            roles:
-              - Invalid role
-      delegate_to: localhost
-      register: invalid_role
-      ignore_errors: true
-
-    - name: Assert "Invalid role found" in previous tasks error
-      ansible.builtin.assert:
-        that:
-          - '"Invalid role found in" in invalid_role.msg'
-
-    - name: Add role to existing syslog server  # Adding doesn't work, just creation
-      cisco.meraki.meraki_syslog:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        servers:
-          - host: 192.0.1.2
-            port: 514
-            roles:
-              - Flows
-      delegate_to: localhost
-      register: add_role
-
-    - name: Assert flows is the role
-      ansible.builtin.assert:
-        that:
-          - add_role.data.servers.0.roles.0 == 'Flows'
-
-  always:
-    - name: Delete syslog test network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      delegate_to: localhost
-      register: delete_all
-      ignore_errors: true
diff --git a/tests/integration/targets/meraki_webhook/tasks/main.yml b/tests/integration/targets/meraki_webhook/tasks/main.yml
deleted file mode 100644
index a75e73d69..000000000
--- a/tests/integration/targets/meraki_webhook/tasks/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Test code for the Meraki Webhooks module
-# Copyright: (c) 2018, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  ansible.builtin.include_tasks:
-    file: tests.yml
diff --git a/tests/integration/targets/meraki_webhook/tasks/tests.yml b/tests/integration/targets/meraki_webhook/tasks/tests.yml
deleted file mode 100644
index 52d952243..000000000
--- a/tests/integration/targets/meraki_webhook/tasks/tests.yml
+++ /dev/null
@@ -1,468 +0,0 @@
-# Test code for the Meraki Webhook module
-# Copyright: (c) 2019, Kevin Breit (@kbreit)
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Test Cases for meraki_webhook module
-  block:
-    - name: Test an API key is provided
-      ansible.builtin.fail:
-        msg: Please define an API key
-      when: auth_key is not defined
-      delegate_to: localhost
-
-    - name: Create test network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        type: appliance
-      delegate_to: localhost
-
-    - name: Query for any webhooks expecting None
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      register: query_none
-      delegate_to: localhost
-
-    - name: Query for any webhooks expecting None - debug
-      ansible.builtin.debug:
-        var: query_none
-      delegate_to: localhost
-
-    - name: Query for any webhooks expecting None - assert
-      ansible.builtin.assert:
-        that:
-          - query_none is not changed
-          - query_none.data[0] is not defined
-      delegate_to: localhost
-
-    - name: Create webhook with check mode
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyone
-      check_mode: true
-      register: create_one_check
-      delegate_to: localhost
-
-    - name: Create webhook with check mode - debug
-      ansible.builtin.debug:
-        var: create_one_check
-      delegate_to: localhost
-
-    - name: Create webhook with check mode - assert
-      ansible.builtin.assert:
-        that:
-          - create_one_check is changed
-          - create_one_check.data is defined
-      delegate_to: localhost
-
-    - name: Create webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyone
-      register: create_one
-      delegate_to: localhost
-
-    - name: Create webhook - debug
-      ansible.builtin.debug:
-        var: create_one
-      delegate_to: localhost
-
-    - name: Create webhook - assert
-      ansible.builtin.assert:
-        that:
-          - create_one is changed
-          - create_one.data is defined
-      delegate_to: localhost
-
-    - name: Set webhook_id for future use
-      ansible.builtin.set_fact:
-        webhook_id: '{{ create_one.data.id }}'
-      delegate_to: localhost
-
-    - name: Query all webhooks expecting 1
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      register: query_one
-      delegate_to: localhost
-
-    - name: Query all webhooks expecting 1 - debug
-      ansible.builtin.debug:
-        var: query_one
-      delegate_to: localhost
-
-    - name: Query all webhooks expecting 1 - assert
-      ansible.builtin.assert:
-        that:
-          - query_one.data is defined
-          - query_one.data[0] is defined
-          - query_one.data[1] is not defined
-      delegate_to: localhost
-
-    - name: Query one webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-      register: query_one
-      delegate_to: localhost
-
-    - name: Query one webhook - debug
-      ansible.builtin.debug:
-        var: query_one
-      delegate_to: localhost
-
-    - name: Query one webhook - assert
-      ansible.builtin.assert:
-        that:
-          - query_one.data is defined
-      delegate_to: localhost
-
-    - name: Query one webhook with id
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        webhook_id: '{{ webhook_id }}'
-      register: query_one_id
-      delegate_to: localhost
-
-    - name: Query one webhook with id - debug
-      ansible.builtin.debug:
-        var: query_one_id
-      delegate_to: localhost
-
-    - name: Query one webhook with id - assert
-      ansible.builtin.assert:
-        that:
-          - query_one_id.data is defined
-      delegate_to: localhost
-
-    - name: Update webhook with check mode
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyonehere
-      check_mode: true
-      register: update_check
-      delegate_to: localhost
-
-    - name: Update webhook with check mode - assert
-      ansible.builtin.assert:
-        that:
-          - update_check is changed
-          - update_check.data is defined
-      delegate_to: localhost
-
-    - name: Update webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyonehere
-      register: update
-      delegate_to: localhost
-
-    - name: Update webhook - debug
-      ansible.builtin.debug:
-        var: update
-      delegate_to: localhost
-
-    - name: Update webhook - assert
-      ansible.builtin.assert:
-        that:
-          - update is changed
-          - update.data is defined
-          - update.data.shared_secret is not defined
-      delegate_to: localhost
-
-    - name: Update webhook with idempotency with shared secret
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyonehere
-      register: update_idempotent
-      delegate_to: localhost
-
-    - name: Update webhook with idempotency with shared secret - debug
-      ansible.builtin.debug:
-        var: update_idempotent
-      delegate_to: localhost
-
-    # response will always be "changed" since shared secret is not sent back in the response.
-    - name: Update webhook with idempotency with shared secret - assert
-      ansible.builtin.assert:
-        that:
-          - update_idempotent is changed
-          - update_idempotent.data is defined
-          - update_idempotent.data.shared_secret is not defined
-      delegate_to: localhost
-
-    - name: Update webhook with idempotency without shared secret
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-      register: update_idempotent2
-      delegate_to: localhost
-
-    - name: Update webhook with idempotency without shared secret - debug
-      ansible.builtin.debug:
-        var: update_idempotent2
-
-    - name: Update webhook with idempotency without shared secret - assert
-      ansible.builtin.assert:
-        that:
-          - update_idempotent2 is not changed
-          - update_idempotent2.data is defined
-          - update_idempotent2.data.shared_secret is not defined
-
-    - name: Update webhook with id
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        webhook_id: '{{ webhook_id }}'
-        name: Test_Hook
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-        shared_secret: shhhdonttellanyonehereid
-      register: update_id
-      delegate_to: localhost
-
-    - name: Update webhook with id - debug
-      ansible.builtin.debug:
-        var: update_id
-
-    # response will always be "changed" since shared secret is not sent back in the response.
-    - name: Update webhook with id - assert
-      ansible.builtin.assert:
-        that:
-          - update_id is changed
-          - update_id.data is defined
-
-    - name: Create webhook payload template for a webhook
-      cisco.meraki.meraki_webhook_payload_template:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: present
-        name: TestPayloadTemplate
-        body: "a fake body"
-      register: payload_template
-      delegate_to: localhost
-
-    - name: Debug payload_template
-      ansible.builtin.debug:
-        var: payload_template
-
-    - name: Create webhook with a payload template
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        payload_template_name: TestPayloadTemplate
-        name: Test_Hook_with_template
-        url: https://webhook.site/8eb5b76f-b167
-        shared_secret: shhhdonttellanyone
-      register: webhook_with_template
-      delegate_to: localhost
-
-    - name: Create webhook with a payload template - debug
-      ansible.builtin.debug:
-        var: webhook_with_template
-
-    - name: Create webhook with a payload template - assert
-      ansible.builtin.assert:
-        that:
-          - webhook_with_template is changed
-          - webhook_with_template.data is defined
-          - webhook_with_template.data.payload_template.name == "TestPayloadTemplate"
-
-    - name: Delete webhook with payload template
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook_with_template
-      register: delete_hook_with_template
-      delegate_to: localhost
-
-    - name: Delete webhook with payload template - debug
-      ansible.builtin.debug:
-        var: delete_hook_with_template
-
-    - name: Delete webhook with payload template - assert
-      ansible.builtin.assert:
-        that:
-          - delete_hook_with_template is changed
-
-    - name: Create test webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: present
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-        test: test
-        url: https://webhook.site/8eb5b76f-b167-4cb8-9fc4-42621b724244
-      register: webhook_test
-      delegate_to: localhost
-
-    - name: Set test_id for future use
-      ansible.builtin.set_fact:
-        test_id: '{{ webhook_test.data.id }}'
-
-    - name: Create test webhook - debug
-      ansible.builtin.debug:
-        var: test_id
-
-    - name: Get webhook status
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        test_id: '{{ test_id }}'
-      register: webhook_test_status
-      delegate_to: localhost
-
-    - name: Get webhook status - debug
-      ansible.builtin.debug:
-        var: webhook_test_status
-
-    - name: Get webhook status - assert
-      ansible.builtin.assert:
-        that:
-          - webhook_test_status.data is defined
-
-    - name: Query all webhooks
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: query
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      register: query_all
-      delegate_to: localhost
-
-    - name: Query all webhooks - debug
-      ansible.builtin.debug:
-        var: query_all
-
-    - name: Delete webhook invalid webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook_Invalid
-      check_mode: true
-      register: delete_invalid
-      ignore_errors: true
-      delegate_to: localhost
-
-    - name: Delete webhook invalid webhook - debug
-      ansible.builtin.debug:
-        var: delete_invalid
-
-    - name: Delete webhook invalid webhook - assert
-      ansible.builtin.assert:
-        that:
-          - 'delete_invalid.msg == "There is no webhook with the name Test_Hook_Invalid"'
-
-    - name: Delete webhook in check mode
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-      check_mode: true
-      register: delete_check
-      delegate_to: localhost
-
-    - name: Delete webhook in check mode - debug
-      ansible.builtin.debug:
-        var: delete_check
-
-    - name: Delete webhook in check mode - assert
-      ansible.builtin.assert:
-        that:
-          - delete_check is changed
-
-    - name: Delete webhook
-      cisco.meraki.meraki_webhook:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        name: Test_Hook
-      register: delete
-      delegate_to: localhost
-
-    - name: Delete webhook - debug
-      ansible.builtin.debug:
-        var: delete
-
-    - name: Delete webhook - assert
-      ansible.builtin.assert:
-        that:
-          - delete is changed
-
-  #############################################################################
-  # Tear down starts here
-  #############################################################################
-  always:
-    - name: Delete webhook payload template for a webhook
-      cisco.meraki.meraki_webhook_payload_template:
-        auth_key: '{{ auth_key }}'
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-        state: absent
-        name: TestPayloadTemplate
-      delegate_to: localhost
-
-    - name: Delete test network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_name: '{{ test_net_name }}'
-      delegate_to: localhost
diff --git a/tests/integration/targets/meraki_webhook_payload_template/tasks/main.yml b/tests/integration/targets/meraki_webhook_payload_template/tasks/main.yml
deleted file mode 100644
index 878b2a45b..000000000
--- a/tests/integration/targets/meraki_webhook_payload_template/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test code for the Meraki modules
-
-# Copyright: (c) 2022, Joshua Coronado (@joshuajcoronado) <joshua@coronado.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Run test cases
-  include: tests.yml ansible_connection=local
diff --git a/tests/integration/targets/meraki_webhook_payload_template/tasks/tests.yml b/tests/integration/targets/meraki_webhook_payload_template/tasks/tests.yml
deleted file mode 100644
index 8353fb27d..000000000
--- a/tests/integration/targets/meraki_webhook_payload_template/tasks/tests.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-# Test code for the Meraki modules
-# Copyright: (c) 2022, Joshua Coronado (@joshuajcoronado) <joshua@coronado.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
----
-- name: Block of tasks
-  block:
-  - name: Create network
-    cisco.meraki.meraki_network:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_name: TestNet
-      state: present
-      type: wireless
-    register: new_net
-
-  - name: Set fact new_net
-    ansible.builtin.set_fact:
-      net: '{{ new_net.data.id }}'
-
-  - name: Query all webhook payload templates
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: query
-    register: query
-
-  - name: Assert query.data is defined
-    ansible.builtin.assert:
-      that:
-        - query.data is defined
-        - query.data | length > 1
-
-  - name: Create payload template with check mode
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: TestTemplate
-      body: "a fake body"
-    check_mode: yes
-    register: create_one_check
-
-  - ansible.builtin.debug:
-      var: create_one_check
-
-  - ansible.builtin.assert:
-      that:
-        - create_one_check is changed
-        - create_one_check.data is defined
-
-  - name: Create webhook payload template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: TestTemplate
-      body: "a fake body"
-    register: basic_template
-
-  - name: Debug basic_template
-    ansible.builtin.debug:
-      var: basic_template
-
-  - name: Assert things were changed
-    ansible.builtin.assert:
-      that:
-        - basic_template.changed
-
-  - name: Query basic template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: query
-      name: TestTemplate
-    register: query
-
-  - name: Debug query
-    ansible.builtin.debug:
-      var: query
-
-  - name: Assert basic template was created
-    ansible.builtin.assert:
-      that:
-        - query.data is defined
-        - not query.changed
-        - query.data.body == "a fake body"
-
-  - name: Update webhook payload template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: TestTemplate
-      body: "a fake body"
-      headers:
-        - name: header1
-          template: "fake header1"
-    register: update_basic_template
-
-  - name: Debug update_basic_template
-    ansible.builtin.debug:
-      var: update_basic_template
-
-  - name: Assert update happened
-    ansible.builtin.assert:
-      that:
-        - update_basic_template.data is defined
-        - update_basic_template.changed
-        - update_basic_template.data.headers | length == 1
-
-  - name: Test idempotency by updating webhook payload template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: TestTemplate
-      body: "a fake body"
-      headers:
-        - name: header1
-          template: "fake header1"
-    register: idempotent_update_basic_template
-
-  - name: Debug update_basic_template
-    ansible.builtin.debug:
-      var: idempotent_update_basic_template
-
-  - name: Assert nothing changed
-    ansible.builtin.assert:
-      that:
-        - not idempotent_update_basic_template.changed
-
-  - name: Delete webhook payload template in check mode
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: absent
-      name: TestTemplate
-    check_mode: yes
-    register: delete_check
-
-  - ansible.builtin.debug:
-      var: delete_check
-
-  - ansible.builtin.assert:
-      that:
-        - delete_check is changed
-
-  - name: Delete basic template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: absent
-      name: TestTemplate
-    register: delete_template
-
-  - name: Debug delete_template
-    ansible.builtin.debug:
-      var: delete_template
-
-  - name: Assert the thing was deleted and changed
-    ansible.builtin.assert:
-      that:
-        - delete_template.changed
-
-  - name: Delete basic template idempotent
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: absent
-      name: TestTemplate
-    register: idempotent_delete_template
-
-  - name: Debug delete_template
-    ansible.builtin.debug:
-      var: idempotent_delete_template
-
-  - name: Assert nothing was changed
-    ansible.builtin.assert:
-      that:
-        - not idempotent_delete_template.changed
-
-  - name: Query deleted basic template
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: query
-      name: TestTemplate
-    register: deleted_template
-    ignore_errors: true
-
-  - name: Debug deleted_template
-    ansible.builtin.debug:
-      var: deleted_template
-
-  - name: Assert we hit an error
-    ansible.builtin.assert:
-      that:
-        - 'deleted_template.msg == "Unable to get webhook payload template named: TestTemplate"'
-
-  #########################################
-  ##  Tests for argument completeness    ##
-  #########################################
-  - name: Test body check
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: TestTemplate
-    register: error_no_body
-    ignore_errors: true
-
-  - name: Assert body is required when creating/updating a template
-    ansible.builtin.assert:
-      that:
-        - 'error_no_body.msg == "body is a required parameter when state is present"'
-
-  - name: Test name check
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-    register: error_no_name
-    ignore_errors: true
-
-  - name: Assert name is required when creating/updating/deleting a template
-    ansible.builtin.assert:
-      that:
-        - 'error_no_name.msg == "name is a required parameter"'
-
-  - name: Test headers args
-    cisco.meraki.meraki_webhook_payload_template:
-      auth_key: '{{ auth_key }}'
-      org_name: '{{ test_org_name }}'
-      net_id: '{{ net }}'
-      state: present
-      name: Test
-      body: "fake body"
-      headers:
-        - name: test
-    register: header_args
-    ignore_errors: true
-
-  - name: Assert headers args are there
-    ansible.builtin.assert:
-      that:
-        - 'header_args.msg == "template in header must be a string"'
-
-  ############################################################################
-  # Tear down starts here
-  ############################################################################
-  always:
-
-    - name: Delete wireless network
-      cisco.meraki.meraki_network:
-        auth_key: '{{ auth_key }}'
-        state: absent
-        org_name: '{{ test_org_name }}'
-        net_id: '{{ net }}'
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
deleted file mode 100644
index d6f190be0..000000000
--- a/tests/sanity/ignore-2.10.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
deleted file mode 100644
index 0e9a3ead8..000000000
--- a/tests/sanity/ignore-2.11.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
-plugins/modules/meraki_intrusion_prevention.py validate-modules:invalid-argument-name
diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
deleted file mode 100644
index 962f011a7..000000000
--- a/tests/sanity/ignore-2.12.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-plugins/modules/meraki_action_batch.py validate-modules!skip
-plugins/modules/meraki_admin.py validate-modules!skip
-plugins/modules/meraki_alert.py validate-modules!skip
-plugins/modules/meraki_config_template.py validate-modules!skip
-plugins/modules/meraki_device.py validate-modules!skip
-plugins/modules/meraki_firewalled_services.py validate-modules!skip
-plugins/modules/meraki_management_interface.py validate-modules!skip
-plugins/modules/meraki_mr_l7_firewall.py validate-modules!skip
-plugins/modules/meraki_mr_radio.py validate-modules!skip
-plugins/modules/meraki_mr_rf_profile.py validate-modules!skip
-plugins/modules/meraki_mr_settings.py validate-modules!skip
-plugins/modules/meraki_mr_ssid.py validate-modules!skip
-plugins/modules/meraki_ms_access_list.py validate-modules!skip
-plugins/modules/meraki_ms_access_policies.py validate-modules!skip
-plugins/modules/meraki_ms_l3_interface.py validate-modules!skip
-plugins/modules/meraki_ms_link_aggregation.py validate-modules!skip
-plugins/modules/meraki_ms_ospf.py validate-modules!skip
-plugins/modules/meraki_ms_stack.py validate-modules!skip
-plugins/modules/meraki_ms_stack_l3_interface.py validate-modules!skip
-plugins/modules/meraki_ms_storm_control.py validate-modules!skip
-plugins/modules/meraki_ms_switchport.py validate-modules!skip
-plugins/modules/meraki_mx_content_filtering.py validate-modules!skip
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules!skip
-plugins/modules/meraki_mx_l2_interface.py validate-modules!skip
-plugins/modules/meraki_mx_l3_firewall.py validate-modules!skip
-plugins/modules/meraki_mx_l7_firewall.py validate-modules!skip
-plugins/modules/meraki_mx_malware.py validate-modules!skip
-plugins/modules/meraki_mx_nat.py validate-modules!skip
-plugins/modules/meraki_mx_network_vlan_settings.py validate-modules!skip
-plugins/modules/meraki_mx_site_to_site_firewall.py validate-modules!skip
-plugins/modules/meraki_mx_site_to_site_vpn.py validate-modules!skip
-plugins/modules/meraki_mx_static_route.py validate-modules!skip
-plugins/modules/meraki_mx_third_party_vpn_peers.py validate-modules!skip
-plugins/modules/meraki_mx_uplink_bandwidth.py validate-modules!skip
-plugins/modules/meraki_mx_vlan.py validate-modules!skip
-plugins/modules/meraki_network.py validate-modules!skip
-plugins/modules/meraki_network_settings.py validate-modules!skip
-plugins/modules/meraki_organization.py validate-modules!skip
-plugins/modules/meraki_snmp.py validate-modules!skip
-plugins/modules/meraki_syslog.py validate-modules!skip
-plugins/modules/meraki_webhook.py validate-modules!skip
-plugins/modules/meraki_webhook_payload_template.py validate-modules!skip
-plugins/modules/meraki_mr_l3_firewall.py validate-modules!skip
-plugins/modules/meraki_action_batch.py yamllint!skip
-plugins/modules/meraki_admin.py yamllint!skip
-plugins/modules/meraki_alert.py yamllint!skip
-plugins/modules/meraki_config_template.py yamllint!skip
-plugins/modules/meraki_device.py yamllint!skip
-plugins/modules/meraki_firewalled_services.py yamllint!skip
-plugins/modules/meraki_management_interface.py yamllint!skip
-plugins/modules/meraki_mr_l7_firewall.py yamllint!skip
-plugins/modules/meraki_mr_radio.py yamllint!skip
-plugins/modules/meraki_mr_rf_profile.py yamllint!skip
-plugins/modules/meraki_mr_settings.py yamllint!skip
-plugins/modules/meraki_mr_ssid.py yamllint!skip
-plugins/modules/meraki_ms_access_list.py yamllint!skip
-plugins/modules/meraki_ms_access_policies.py yamllint!skip
-plugins/modules/meraki_ms_l3_interface.py yamllint!skip
-plugins/modules/meraki_ms_link_aggregation.py yamllint!skip
-plugins/modules/meraki_ms_ospf.py yamllint!skip
-plugins/modules/meraki_ms_stack.py yamllint!skip
-plugins/modules/meraki_ms_stack_l3_interface.py yamllint!skip
-plugins/modules/meraki_ms_storm_control.py yamllint!skip
-plugins/modules/meraki_ms_switchport.py yamllint!skip
-plugins/modules/meraki_mx_content_filtering.py yamllint!skip
-plugins/modules/meraki_mx_intrusion_prevention.py yamllint!skip
-plugins/modules/meraki_mx_l2_interface.py yamllint!skip
-plugins/modules/meraki_mx_l3_firewall.py yamllint!skip
-plugins/modules/meraki_mx_l7_firewall.py yamllint!skip
-plugins/modules/meraki_mx_malware.py yamllint!skip
-plugins/modules/meraki_mx_nat.py yamllint!skip
-plugins/modules/meraki_mx_network_vlan_settings.py yamllint!skip
-plugins/modules/meraki_mx_site_to_site_firewall.py yamllint!skip
-plugins/modules/meraki_mx_site_to_site_vpn.py yamllint!skip
-plugins/modules/meraki_mx_static_route.py yamllint!skip
-plugins/modules/meraki_mx_third_party_vpn_peers.py yamllint!skip
-plugins/modules/meraki_mx_uplink_bandwidth.py yamllint!skip
-plugins/modules/meraki_mx_vlan.py yamllint!skip
-plugins/modules/meraki_network.py yamllint!skip
-plugins/modules/meraki_network_settings.py yamllint!skip
-plugins/modules/meraki_organization.py yamllint!skip
-plugins/modules/meraki_snmp.py yamllint!skip
-plugins/modules/meraki_syslog.py yamllint!skip
-plugins/modules/meraki_webhook.py yamllint!skip
-plugins/modules/meraki_webhook_payload_template.py yamllint!skip
-plugins/modules/meraki_mr_l3_firewall.py yamllint!skip
-plugins/modules/meraki_action_batch.py ansible-doc!skip
-plugins/modules/meraki_admin.py ansible-doc!skip
-plugins/modules/meraki_alert.py ansible-doc!skip
-plugins/modules/meraki_config_template.py ansible-doc!skip
-plugins/modules/meraki_device.py ansible-doc!skip
-plugins/modules/meraki_firewalled_services.py ansible-doc!skip
-plugins/modules/meraki_management_interface.py ansible-doc!skip
-plugins/modules/meraki_mr_l7_firewall.py ansible-doc!skip
-plugins/modules/meraki_mr_radio.py ansible-doc!skip
-plugins/modules/meraki_mr_rf_profile.py ansible-doc!skip
-plugins/modules/meraki_mr_settings.py ansible-doc!skip
-plugins/modules/meraki_mr_ssid.py ansible-doc!skip
-plugins/modules/meraki_ms_access_list.py ansible-doc!skip
-plugins/modules/meraki_ms_access_policies.py ansible-doc!skip
-plugins/modules/meraki_ms_l3_interface.py ansible-doc!skip
-plugins/modules/meraki_ms_link_aggregation.py ansible-doc!skip
-plugins/modules/meraki_ms_ospf.py ansible-doc!skip
-plugins/modules/meraki_ms_stack.py ansible-doc!skip
-plugins/modules/meraki_ms_stack_l3_interface.py ansible-doc!skip
-plugins/modules/meraki_ms_storm_control.py ansible-doc!skip
-plugins/modules/meraki_ms_switchport.py ansible-doc!skip
-plugins/modules/meraki_mx_content_filtering.py ansible-doc!skip
-plugins/modules/meraki_mx_intrusion_prevention.py ansible-doc!skip
-plugins/modules/meraki_mx_l2_interface.py ansible-doc!skip
-plugins/modules/meraki_mx_l3_firewall.py ansible-doc!skip
-plugins/modules/meraki_mx_l7_firewall.py ansible-doc!skip
-plugins/modules/meraki_mx_malware.py ansible-doc!skip
-plugins/modules/meraki_mx_nat.py ansible-doc!skip
-plugins/modules/meraki_mx_network_vlan_settings.py ansible-doc!skip
-plugins/modules/meraki_mx_site_to_site_firewall.py ansible-doc!skip
-plugins/modules/meraki_mx_site_to_site_vpn.py ansible-doc!skip
-plugins/modules/meraki_mx_static_route.py ansible-doc!skip
-plugins/modules/meraki_mx_third_party_vpn_peers.py ansible-doc!skip
-plugins/modules/meraki_mx_uplink_bandwidth.py ansible-doc!skip
-plugins/modules/meraki_mx_vlan.py ansible-doc!skip
-plugins/modules/meraki_network.py ansible-doc!skip
-plugins/modules/meraki_network_settings.py ansible-doc!skip
-plugins/modules/meraki_organization.py ansible-doc!skip
-plugins/modules/meraki_snmp.py ansible-doc!skip
-plugins/modules/meraki_syslog.py ansible-doc!skip
-plugins/modules/meraki_webhook.py ansible-doc!skip
-plugins/modules/meraki_webhook_payload_template.py ansible-doc!skip
-plugins/modules/meraki_mr_l3_firewall.py ansible-doc!skip
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt
deleted file mode 100644
index dce1be5cb..000000000
--- a/tests/sanity/ignore-2.14.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt
deleted file mode 100644
index dce1be5cb..000000000
--- a/tests/sanity/ignore-2.15.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt
deleted file mode 100644
index dce1be5cb..000000000
--- a/tests/sanity/ignore-2.16.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
deleted file mode 100644
index dce1be5cb..000000000
--- a/tests/sanity/ignore-2.17.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt
deleted file mode 100644
index 6c3c3f062..000000000
--- a/tests/sanity/ignore-2.18.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
-plugins/modules/meraki_mx_content_filtering.py validate-modules!skip
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.19.txt b/tests/sanity/ignore-2.19.txt
deleted file mode 100644
index 6c3c3f062..000000000
--- a/tests/sanity/ignore-2.19.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-plugins/modules/meraki_mx_intrusion_prevention.py validate-modules:invalid-argument-name
-plugins/modules/meraki_mx_content_filtering.py validate-modules!skip
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
deleted file mode 100644
index 00914499a..000000000
--- a/tests/sanity/ignore-2.9.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-plugins/modules/meraki_intrusion_prevention.py invalid-argument-name # ignore missing argument
-plugins/modules/meraki_intrusion_prevention.py nonexistent-parameter-documented # ignore missing argument
diff --git a/workflows/sanity_tests.yml b/workflows/sanity_tests.yml
index 4a29d224a..baec49bab 100644
--- a/workflows/sanity_tests.yml
+++ b/workflows/sanity_tests.yml
@@ -6,7 +6,7 @@ on:
     - cron: '0 6 * * *'
 env:
   NAMESPACE: cisco
-  COLLECTION_NAME: meraki 
+  COLLECTION_NAME: meraki
 jobs:
   sanity:
     name: Sanity (Ⓐ${{ matrix.ansible }})
@@ -33,4 +33,4 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color
-        working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
\ No newline at end of file
+        working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}