diff --git a/.gitignore b/.gitignore
index f60d98f3b6d11a7172433be064938e0fb9b29374..197c94213aca2c81b0f973b69caee31984636f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,15 +20,16 @@
 **/venv
 **/*_pb2.*
 **/*_pb2_grpc.*
+tangostationcontrol/_version.py
 
-tangostationcontrol/build
-tangostationcontrol/cover
-tangostationcontrol/dist
-tangostationcontrol/docs/build
-tangostationcontrol/Lib
+build
+cover
+dist
+docs/build
 **/coverage.xml
 **/.coverage
 **/.coverage*
+!.coveragerc
 **/.ipynb_checkpoints
 **/pending_log_messages.db
 **/.eggs
@@ -50,8 +51,3 @@ infra/dev/nomad/tmp/*
 /docker/snmp-exporter/tmp/
 /docker/snmp-exporter/snmp.yml
 /.vs
-tangostationcontrol/Scripts/*
-Scripts/*
-tangostationcontrol/pyvenv.cfg
-pyvenv.cfg
-Lib/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 269f7a687c9d5bac7075cc1fcc9bb37fbee23650..c2f3ed3451ccf551eade4a87d5aa68925553caab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,60 +1,155 @@
-image: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG
+default:
+  image:
+    name: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG
+    pull_policy: always
+  before_script:
+    - python --version # For debugging
+  cache:
+    paths:
+      - .cache/pip
+      # Do not cache .tox, to recreate virtualenvs for every step
+
+stages:
+  - prepare
+  - lint
+  - test
+  - package
+  - images
+  - integration
+  - publish
+  - deploy
+
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  PIP_REQUIREMENTS_FILE: "tangostationcontrol/requirements.txt"
-cache:
-  key: $CI_COMMIT_REF_SLUG
-  paths:
-    - .cache/pip
+  PIP_REQUIREMENTS_FILE: "requirements.txt"
+
 workflow:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: $CI_COMMIT_TAG
     - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
+
 include:
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml
 
-stages:
-  - prepare
-  - packaging
-  - images
-  - building
-  - linting
-  - documentation
-  - static-analysis
-  - unit-tests
-  - integration-tests
-  - publish
-  - deploy
-
+# Prepare image to run ci on
 trigger_prepare:
   stage: prepare
   trigger:
     strategy: depend
     include: .prepare.gitlab-ci.yml
 
-wheel_packaging:
-  stage: packaging
+run_lint:
+  stage: lint
+  script:
+    - tox -e lint
+
+run_shellcheck:
+  stage: lint
   needs:
     - trigger_prepare
+  script:
+    - shellcheck --version
+    - shellcheck **/*.sh
+
+run_CDB_correctness:
+  stage: test
+  script:
+    - cd $CI_PROJECT_DIR/CDB/stations
+    - |
+      for hierarchy in Power Control
+      do
+        # test environments
+        python $CI_PROJECT_DIR/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs001.json testenv_cs001.json
+        # production environments
+        python $CI_PROJECT_DIR/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs001.json
+        python $CI_PROJECT_DIR/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs032.json
+        python $CI_PROJECT_DIR/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_remote.json rs.json rs307.json
+        python $CI_PROJECT_DIR/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json DTS.json
+      done
+
+sast:
+  stage: test
+  variables:
+    SAST_EXCLUDED_PATHS: "*.tox"
+    SAST_EXCLUDED_ANALYZERS: brakeman, flawfinder, kubesec, nodejs-scan, phpcs-security-audit,
+      pmd-apex, security-code-scan, sobelow, spotbugs
+
+dependency_scanning:
+  stage: test
+  # override default before_script, job won't have Python available
+  before_script:
+    - uname
+
+secret_detection:
+  stage: test
+  # override default before_script, job won't have Python available
+  before_script:
+    - uname
+
+# Basic setup for all Python versions for which we don't have a base image
+.run_unit_test_version_base:
+  before_script:
+    - python --version # For debugging
+    - python -m pip install --upgrade pip
+    - python -m pip install --upgrade tox twine
+
+# Run all unit tests for Python versions except the base image
+run_unit_tests:
+  extends: .run_unit_test_version_base
+  stage: test
+  allow_failure: true
+  image: python:3.${PY_VERSION}
+  script:
+    - tox -e py3${PY_VERSION}
+  parallel:
+    matrix: # use the matrix for testing
+      - PY_VERSION: [10, 11]
+
+run_unit_tests_coverage:
+  extends: .run_unit_test_version_base
+  stage: test
+  script:
+    - tox -e coverage
+  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
     paths:
-      - tangostationcontrol/dist/*.whl
+      - cover/*
+      - .coverage
+      - htmlcov/*
+
+package_files:
+  stage: package
+  artifacts:
+    expire_in: 1w
+    paths:
+      - dist/*.whl
   script:
-    - cd tangostationcontrol
     - tox -e build
 
+
+sphinx_documentation:
+  stage: package
+  artifacts:
+    expire_in: 1w
+    paths:
+      - docs/build/
+  script:
+    - tox -e docs
+
   # See docker-compose/README.md for docker image behavior and explanation
 .base_docker_images:
   stage: images
   image: docker:latest
-  dependencies:
-    - wheel_packaging
   needs:
-    - wheel_packaging
+    - package_files
   before_script:
     - |
       if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" && -z "$CI_COMMIT_TAG" ]]; then
@@ -139,134 +234,13 @@ docker_build_image_device_base:
     #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base $tag
 
-newline_at_eof:
-  stage: linting
-  needs:
-    - trigger_prepare
-  before_script:
-    - pip3 install -r tangostationcontrol/test-requirements.txt
-  script:
-    #     TODO(Corne): Ignore shell files in submodules more cleanly
-    - flake8 --filename *.sh,*.conf,*.md,*.yml --select=W292 --exclude .tox,.egg-info,docker
-
-run_black:
-  stage: linting
-  needs:
-    - trigger_prepare
-  script:
-    - cd tangostationcontrol
-    - tox -e black | tee tox-black.out
-    # extract patch provided by black from the tox output
-    - sed -n '/--diff/,/Oh no!/{//!p}' tox-black.out > black.patch
-  artifacts:
-    when: always
-    paths:
-      - tangostationcontrol/black.patch
-
-run_flake8:
-  stage: linting
-  needs:
-    - trigger_prepare
-  script:
-    - cd tangostationcontrol
-    - tox -e pep8
-
-run_pylint:
-  stage: linting
-  needs:
-    - trigger_prepare
-  allow_failure: true
-  script:
-    - cd tangostationcontrol
-    - tox -e pylint
 
-.xenon:
-  stage: static-analysis
-  needs:
-    - trigger_prepare
-  allow_failure: true
-  script:
-    - cd tangostationcontrol
-    - tox -e xenon
-
-shellcheck:
-  stage: static-analysis
-  needs:
-    - trigger_prepare
-  script:
-    #     TODO(Corne): L2SS-962: Ignore shell files in submodules
-    - shellcheck --version
-    - shellcheck **/*.sh
-
-CDB_correctness:
-  stage: static-analysis
-  needs:
-    - trigger_prepare
-  script:
-    - cd $CI_PROJECT_DIR/CDB/stations
-    - |
-      for hierarchy in Power Control
-      do
-        # test environments
-        python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs001.json testenv_cs001.json
-        # production environments
-        python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs001.json
-        python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs.json cs032.json
-        python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_remote.json rs.json rs307.json
-        python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json DTS.json
-      done
-
-sast:
-  stage: static-analysis
-  needs: [ ]
-  variables:
-    SAST_EXCLUDED_PATHS: "*.tox"
-    SAST_EXCLUDED_ANALYZERS: brakeman, flawfinder, kubesec, nodejs-scan, phpcs-security-audit,
-      pmd-apex, security-code-scan, sobelow, spotbugs
-
-dependency_scanning:
-  stage: static-analysis
-  needs: [ ]
-  before_script:
-    - rm -r `ls | grep -v "^tangostationcontrol$"`
-
-secret_detection:
-  stage: static-analysis
-  needs: [ ]
-
-sphinx_documentation:
-  stage: documentation
-  needs:
-    - trigger_prepare
-  script:
-    - cd tangostationcontrol
-    - tox -e docs
-  artifacts:
-    paths:
-      - tangostationcontrol/docs/build/
-
-unit_test:
-  stage: unit-tests
-  needs:
-    - trigger_prepare
-  script:
-    - cd tangostationcontrol
-    - tox -e cover
-  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
-  artifacts:
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: tangostationcontrol/coverage.xml
-    paths:
-      - tangostationcontrol/cover/*
-      - tangostationcontrol/.coverage
 
-.test_docker:
-  stage: integration-tests
+.run_integration_tests:
+  stage: integration
   image: docker:latest
   needs:
-    - unit_test
+    - run_unit_tests
     - docker_build_image_device_base
   tags:
     - integration_tests
@@ -305,26 +279,26 @@ unit_test:
       - log/
       - .jumppad/logs/
 
-integration_test_core:
-  extends: .test_docker
+run_integration_test_core:
+  extends: .run_integration_tests
   script:
     #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs --module="tango" --station=cs
 
-integration_test_remote:
-  extends: .test_docker
+run_integration_test_remote:
+  extends: .run_integration_tests
   script:
     #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs --module="tango" --station=rs
 
-service_test_docker:
-  extends: .test_docker
+run_service_test_docker:
+  extends: .run_integration_tests
   script:
     # Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --skip-tests --module="services" --station=cs
 
-multi_project_integration_test:
-  stage: integration-tests
+run_multi_project_integration_test:
+  stage: integration
   needs:
     - docker_build_image_device_base
   variables:
@@ -343,7 +317,7 @@ publish_on_gitlab:
   stage: publish
   environment: gitlab
   needs:
-    - wheel_packaging
+    - package_files
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
     - if: $CI_COMMIT_TAG
@@ -358,7 +332,7 @@ publish_on_gitlab:
     - pip install twine --upgrade
   script:
     - echo "run twine for gitlab"
-    - python3 -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi tangostationcontrol/dist/*
+    - python3 -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
 
 release_job:
   stage: publish
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 95b3695651ae5f82acf995d674e08073e7d42b68..018cfbb0da2e30e8267792cac1c6c618f71b695e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,19 +7,17 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-yaml
-  - repo: local
+      - id: check-toml
+      - id: detect-private-key
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
     hooks:
-      - id: tox-black
-        name: tox-black (local)
-        entry: bash
-        language: system
-        require_serial: true
-        args: ["-c", "cd tangostationcontrol; tox -e black"]
+      - id: shellcheck
   - repo: local
     hooks:
-      - id: tox-pep8
-        name: tox-pep8 (local)
-        entry: bash
-        language: system
-        require_serial: true
-        args: ["-c", "cd tangostationcontrol; tox -e pep8"]
+      - id: tox-lint
+        name: tox-lint (local)
+        entry: tox
+        language: python
+        types: [file, python]
+        args: ["-e",  "lint", "--"]
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000000000000000000000000000000000..3d953123d4b087035bd300984d7065a0eb35f1d4
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include LICENSE.txt
+include README.md
+
+include tangostationcontrol/configuration/schemas/*.json
+recursive-exclude tests
+recursive-exclude integration_tests
diff --git a/NEWSTATION.md b/NEWSTATION.md
index 3ba5251548af0423a0eb777dafc042015efb6061..0704c04e3721bcfc4147bce144f9458f4ab85a0f 100644
--- a/NEWSTATION.md
+++ b/NEWSTATION.md
@@ -4,9 +4,9 @@ When deploying to a new station, for example CS123, you will need to:
 
 * `infra/station`: Deploy the LCU as cs123c.control.lofar using the Ansible playbooks,
 * `.gitlab_ci.yml`: Add "cs123" as a target to the `deploy_nomad` job, and deploy,
-* `CBD/stations/CS123.json`: Create and populate the station-specific Tango configuration. To generate this from LOFAR1, run `tangostationcontrol/tangostationcontrol/toolkit/generate-cdb-from-lofar1.py -s cs123 -C > CDB/stations/CS123.json`,
+* `CBD/stations/CS123.json`: Create and populate the station-specific Tango configuration. To generate this from LOFAR1, run `tangostationcontrol/toolkit/generate-cdb-from-lofar1.py -s cs123 -C > CDB/stations/CS123.json`,
 * Upload the CDB files through http://cs123c.control.lofar:4646/ui/jobs/dsconfig@default/dispatch, see the [CDB Readme](CDB/stations/README.md) for the list files.
-* Obtain calibration tables and upload them to MinIO at http://cs123c.control.lofar:9001/browser/caltables/CS123. To generate them from LOFAR1, run `tangostationcontrol/tangostationcontrol/toolkit/generate-caltable-from-lofar1.py -s cs123`.
+* Obtain calibration tables and upload them to MinIO at http://cs123c.control.lofar:9001/browser/caltables/CS123. To generate them from LOFAR1, run `tangostationcontrol/toolkit/generate-caltable-from-lofar1.py -s cs123`.
 
 To integrate it further into LOFAR, you will need to:
 
diff --git a/README.md b/README.md
index d6189af1a9b672d9beb366d275d224d0ea8b9b43..3ad9b99583d7a1111367abd5ef430951be00502a 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,11 @@ Station Control software related to Tango devices. \
     * [Adding a new station](NEWSTATION.md)
     * [Versioning](#versioning)
 * Source code documentation
-    * [Attribute wrapper documentation](tangostationcontrol/tangostationcontrol/clients/README.md)
-    * [Adding a new tango device](tangostationcontrol/tangostationcontrol/devices/README.md)
-    * [HDF5 statistics](tangostationcontrol/tangostationcontrol/statistics/README.md)
-* [Unit tests](tangostationcontrol/tangostationcontrol/test/README.md)
-* [Integration tests](tangostationcontrol/tangostationcontrol/integration_test/README.md)
+    * [Attribute wrapper documentation](tangostationcontrol/clients/README.md)
+    * [Adding a new tango device](tangostationcontrol/devices/README.md)
+    * [HDF5 statistics](tangostationcontrol/statistics/README.md)
+* [Unit tests](tangostationcontrol/test/README.md)
+* [Integration tests](tangostationcontrol/integration_tests/README.md)
 * [Release Notes](#release-notes)
 
 # Installation
diff --git a/bin/hooks/pre-commit.sh b/bin/hooks/pre-commit.sh
new file mode 100755
index 0000000000000000000000000000000000000000..792a3aabef83dc4ebf0c94635ae1de0e7412c479
--- /dev/null
+++ b/bin/hooks/pre-commit.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ ! -f "setup.sh" ]; then
+  echo "pre-commit.sh must be executed with repository root as working directory!"
+  exit 1
+fi
+
+pre-commit install --hook-type pre-push
diff --git a/tangostationcontrol/debug-requirements.txt b/debug-requirements.txt
similarity index 100%
rename from tangostationcontrol/debug-requirements.txt
rename to debug-requirements.txt
diff --git a/docker/Makefile b/docker/Makefile
index b5d6d3c3fe9304c90d0b414e4e7f37681556d7e2..52f27ea310c428af9d7c2466d0f325103b2a9256 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -12,14 +12,13 @@ context: ## Move and build the necessary files to create minimal docker context
 	rm -rf ./lofar-device-base/tmp; \
 	mkdir -p lofar-device-base/tmp; \
 	if [[ "${NO_BUILD}" -ne "1" ]]; then \
-	    rm -rf ../tangostationcontrol/dist; \
-	    cd ../tangostationcontrol; \
+	    rm -rf ../dist; \
 	    tox -e build; \
 	    cd ../docker; \
     fi; \
-	cp ../tangostationcontrol/dist/*.whl lofar-device-base/tmp/; \
-	cp ../tangostationcontrol/requirements.txt lofar-device-base/tmp/; \
-	cp ../tangostationcontrol/debug-requirements.txt lofar-device-base/tmp/; \
+	cp ../dist/*.whl lofar-device-base/tmp/; \
+	cp ../requirements.txt lofar-device-base/tmp/; \
+	cp ../debug-requirements.txt lofar-device-base/tmp/; \
 
 jupyter-lab ec-sim grafana landing-page:
 	docker build -f $@/Dockerfile -t $(LOCAL_DOCKER_REGISTRY)/$@:$(TAG) $@
diff --git a/docker/ec-sim/ec_sim.py b/docker/ec-sim/ec_sim.py
index 6dae2dd0b6b5d0bb6e524208a684b65d37f8d936..1bd3ab760b2e7658f0d46ea059fe81461eeb8daa 100755
--- a/docker/ec-sim/ec_sim.py
+++ b/docker/ec-sim/ec_sim.py
@@ -1,12 +1,8 @@
 import asyncio
-import copy
 import logging
-from datetime import datetime
-import time
-from math import sin
 
 
-from asyncua import ua, uamethod, Server
+from asyncua import ua, Server
 
 
 _logger = logging.getLogger(__name__)
@@ -42,7 +38,7 @@ async def main():
 
     # setup our own namespace
     # uri = "http://examples.freeopcua.github.io"
-    idx2 = await server.register_namespace(
+    await server.register_namespace(
         "urn:SIMATIC.S7-1200.OPC-UA.Application:PLC_1"
     )
     idx3 = await server.register_namespace("http://opcfoundation.org/UA/DI/")
diff --git a/docker/jupyter-lab/default-notebooks/Station State Transitions.ipynb b/docker/jupyter-lab/default-notebooks/Station State Transitions.ipynb
index 9c49c4a7159f1d918c6534e6446a8a94f7c6d725..3c803ed8abc1494fe338ba85455dcb38914b06b2 100755
--- a/docker/jupyter-lab/default-notebooks/Station State Transitions.ipynb	
+++ b/docker/jupyter-lab/default-notebooks/Station State Transitions.ipynb	
@@ -399,7 +399,6 @@
    "source": [
     "# Verify that Prometheus is working, and everything is scraped. Result should all be >0\n",
     "\n",
-    "from http import HTTPStatus\n",
     "import urllib\n",
     "import requests\n",
     "import json\n",
diff --git a/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/01-stationcontrol.py b/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/01-stationcontrol.py
index 3d143d2ac03c1552f3a2230d6d5ee86d71ed0693..824e99761e0da9e9eaf09876bda2b09e649879a9 100644
--- a/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/01-stationcontrol.py
+++ b/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/01-stationcontrol.py
@@ -2,8 +2,5 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 # noinspection PyUnresolvedReferences
-import lofar_lotus as lofar_station_client
-import lofar_lotus
 
 # noinspection PyUnresolvedReferences
-import tangostationcontrol
diff --git a/tangostationcontrol/docs/README.md b/docs/README.md
similarity index 100%
rename from tangostationcontrol/docs/README.md
rename to docs/README.md
diff --git a/docs/cleanup.py b/docs/cleanup.py
new file mode 100644
index 0000000000000000000000000000000000000000..7256fbc6d80bb68dd0dbbaaa518b3c16efbef929
--- /dev/null
+++ b/docs/cleanup.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+#  Copyright (C) 2023 ASTRON (Netherlands Institute for Radio Astronomy)
+#  SPDX-License-Identifier: Apache-2.0
+
+import os
+
+file_dir = os.path.dirname(os.path.realpath(__file__))
+
+clean_dir = os.path.join(file_dir, "source", "source_documentation")
+print(f"Cleaning.. {clean_dir}/*")
+
+if not os.path.exists(clean_dir):
+    exit()
+
+for file_name in os.listdir(clean_dir):
+    file = os.path.join(clean_dir, file_name)
+
+    if file_name == "index.rst":
+        continue
+
+    print(f"Removing.. {file}")
+    os.remove(file)
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3c6e46c6db7ddaf65e47cfa22c9ec0b914f7fd38
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,5 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+sphinx-rtd-theme>=0.4.3 #MIT
+sphinxcontrib-apidoc>=0.3.0 #BSD
+myst-parser>=2.0 # MIT
+docutils>=0.17 # BSD
diff --git a/tangostationcontrol/docs/source/broken_hardware.rst b/docs/source/broken_hardware.rst
similarity index 99%
rename from tangostationcontrol/docs/source/broken_hardware.rst
rename to docs/source/broken_hardware.rst
index 7047d324ed7085122225a6e07ca67e830835b876..7d012bbebf33ce12cc989c8812cd1070bebedf99 100644
--- a/tangostationcontrol/docs/source/broken_hardware.rst
+++ b/docs/source/broken_hardware.rst
@@ -44,4 +44,3 @@ At boot, during hardware initialisation, the following devices toggle power:
   * Enabled in the ``Antenna_Needs_Power`` property.
 
 .. note:: Exotic inputs like a noise source must not receive power, even when used. Use the ``Antenna_Needs_Power`` property to configure which antennas should be powered on.
-
diff --git a/tangostationcontrol/docs/source/calibration.rst b/docs/source/calibration.rst
similarity index 100%
rename from tangostationcontrol/docs/source/calibration.rst
rename to docs/source/calibration.rst
diff --git a/tangostationcontrol/docs/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from tangostationcontrol/docs/source/conf.py
rename to docs/source/conf.py
diff --git a/tangostationcontrol/docs/source/configure_station.rst b/docs/source/configure_station.rst
similarity index 100%
rename from tangostationcontrol/docs/source/configure_station.rst
rename to docs/source/configure_station.rst
diff --git a/tangostationcontrol/docs/source/developer.rst b/docs/source/developer.rst
similarity index 100%
rename from tangostationcontrol/docs/source/developer.rst
rename to docs/source/developer.rst
diff --git a/tangostationcontrol/docs/source/devices/afh-afl.rst b/docs/source/devices/afh-afl.rst
similarity index 99%
rename from tangostationcontrol/docs/source/devices/afh-afl.rst
rename to docs/source/devices/afh-afl.rst
index b7b4c1c318492611e80b341f69e6fa21de93d059..074a890ee2882b54aed162ff233e32b190d8ee89 100644
--- a/tangostationcontrol/docs/source/devices/afh-afl.rst
+++ b/docs/source/devices/afh-afl.rst
@@ -119,4 +119,3 @@ These facts allow us to use the following information to calculate the absolute
 :recv.PQR_to_ETRS_rotation_matrix: (property) The 3D rotation matrix to convert PQR coordinates into relative ETRS coordinates.
 
   :type: ``float[3][3]``
-
diff --git a/tangostationcontrol/docs/source/devices/beamlet.rst b/docs/source/devices/beamlet.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/beamlet.rst
rename to docs/source/devices/beamlet.rst
diff --git a/tangostationcontrol/docs/source/devices/bst-sst-xst.rst b/docs/source/devices/bst-sst-xst.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/bst-sst-xst.rst
rename to docs/source/devices/bst-sst-xst.rst
diff --git a/tangostationcontrol/docs/source/devices/ccd.rst b/docs/source/devices/ccd.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/ccd.rst
rename to docs/source/devices/ccd.rst
diff --git a/tangostationcontrol/docs/source/devices/configuration.rst b/docs/source/devices/configuration.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/configuration.rst
rename to docs/source/devices/configuration.rst
diff --git a/tangostationcontrol/docs/source/devices/configure.rst b/docs/source/devices/configure.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/configure.rst
rename to docs/source/devices/configure.rst
diff --git a/tangostationcontrol/docs/source/devices/docker.rst b/docs/source/devices/docker.rst
similarity index 99%
rename from tangostationcontrol/docs/source/devices/docker.rst
rename to docs/source/devices/docker.rst
index 6ac9d06d452b5c39a48d27687b225cd48c0af769..efd83b3be855534a669837d1c04f973083099bd1 100644
--- a/tangostationcontrol/docs/source/devices/docker.rst
+++ b/docs/source/devices/docker.rst
@@ -14,5 +14,3 @@ The ``docker == DeviceProxy("STAT/Docker/1")`` device controls the docker contai
   :type: ``bool``
 
 .. warning:: Do *not* stop the ``tango`` container, as doing so cripples the Tango infrastructure, leaving the station inoperable. It is also not wise to stop the ``device_docker`` container, as doing so would render this device unreachable.
-
-
diff --git a/tangostationcontrol/docs/source/devices/ec.rst b/docs/source/devices/ec.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/ec.rst
rename to docs/source/devices/ec.rst
diff --git a/tangostationcontrol/docs/source/devices/overview.rst b/docs/source/devices/overview.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/overview.rst
rename to docs/source/devices/overview.rst
diff --git a/tangostationcontrol/docs/source/devices/recvh-recvl.rst b/docs/source/devices/recvh-recvl.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/recvh-recvl.rst
rename to docs/source/devices/recvh-recvl.rst
diff --git a/tangostationcontrol/docs/source/devices/sdp.rst b/docs/source/devices/sdp.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/sdp.rst
rename to docs/source/devices/sdp.rst
diff --git a/tangostationcontrol/docs/source/devices/sdpfirmware.rst b/docs/source/devices/sdpfirmware.rst
similarity index 99%
rename from tangostationcontrol/docs/source/devices/sdpfirmware.rst
rename to docs/source/devices/sdpfirmware.rst
index e7328e7528aeb75ecec9a7d77b8afce2626a8c80..ef50c7be6dfa80d09e287e117bcfeead97441bd0 100644
--- a/tangostationcontrol/docs/source/devices/sdpfirmware.rst
+++ b/docs/source/devices/sdpfirmware.rst
@@ -31,4 +31,3 @@ These attributes summarise the basic state of the device. Any elements which are
 :FPGA_error_R: Whether the FPGAs appear usable.
 
   :type: ``bool[N_fpgas]``
-
diff --git a/tangostationcontrol/docs/source/devices/station-manager.rst b/docs/source/devices/station-manager.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/station-manager.rst
rename to docs/source/devices/station-manager.rst
diff --git a/tangostationcontrol/docs/source/devices/temperature-manager.rst b/docs/source/devices/temperature-manager.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/temperature-manager.rst
rename to docs/source/devices/temperature-manager.rst
diff --git a/tangostationcontrol/docs/source/devices/tilebeam-digitalbeam.rst b/docs/source/devices/tilebeam-digitalbeam.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/tilebeam-digitalbeam.rst
rename to docs/source/devices/tilebeam-digitalbeam.rst
diff --git a/tangostationcontrol/docs/source/devices/using.rst b/docs/source/devices/using.rst
similarity index 100%
rename from tangostationcontrol/docs/source/devices/using.rst
rename to docs/source/devices/using.rst
diff --git a/tangostationcontrol/docs/source/faq.rst b/docs/source/faq.rst
similarity index 100%
rename from tangostationcontrol/docs/source/faq.rst
rename to docs/source/faq.rst
diff --git a/tangostationcontrol/docs/source/index.rst b/docs/source/index.rst
similarity index 100%
rename from tangostationcontrol/docs/source/index.rst
rename to docs/source/index.rst
diff --git a/tangostationcontrol/docs/source/installation.rst b/docs/source/installation.rst
similarity index 100%
rename from tangostationcontrol/docs/source/installation.rst
rename to docs/source/installation.rst
diff --git a/tangostationcontrol/docs/source/interfaces/control.rst b/docs/source/interfaces/control.rst
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/control.rst
rename to docs/source/interfaces/control.rst
diff --git a/tangostationcontrol/docs/source/interfaces/grafana_dashboard_1.png b/docs/source/interfaces/grafana_dashboard_1.png
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/grafana_dashboard_1.png
rename to docs/source/interfaces/grafana_dashboard_1.png
diff --git a/tangostationcontrol/docs/source/interfaces/grafana_dashboard_2.png b/docs/source/interfaces/grafana_dashboard_2.png
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/grafana_dashboard_2.png
rename to docs/source/interfaces/grafana_dashboard_2.png
diff --git a/tangostationcontrol/docs/source/interfaces/jupyter_basic_example.png b/docs/source/interfaces/jupyter_basic_example.png
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/jupyter_basic_example.png
rename to docs/source/interfaces/jupyter_basic_example.png
diff --git a/tangostationcontrol/docs/source/interfaces/jupyter_console_basic_example.png b/docs/source/interfaces/jupyter_console_basic_example.png
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/jupyter_console_basic_example.png
rename to docs/source/interfaces/jupyter_console_basic_example.png
diff --git a/tangostationcontrol/docs/source/interfaces/logs.rst b/docs/source/interfaces/logs.rst
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/logs.rst
rename to docs/source/interfaces/logs.rst
diff --git a/tangostationcontrol/docs/source/interfaces/loki_basic_example.png b/docs/source/interfaces/loki_basic_example.png
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/loki_basic_example.png
rename to docs/source/interfaces/loki_basic_example.png
diff --git a/tangostationcontrol/docs/source/interfaces/monitoring.rst b/docs/source/interfaces/monitoring.rst
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/monitoring.rst
rename to docs/source/interfaces/monitoring.rst
diff --git a/tangostationcontrol/docs/source/interfaces/overview.rst b/docs/source/interfaces/overview.rst
similarity index 100%
rename from tangostationcontrol/docs/source/interfaces/overview.rst
rename to docs/source/interfaces/overview.rst
diff --git a/tangostationcontrol/docs/source/observing.rst b/docs/source/observing.rst
similarity index 100%
rename from tangostationcontrol/docs/source/observing.rst
rename to docs/source/observing.rst
diff --git a/tangostationcontrol/docs/source/protection_control.rst b/docs/source/protection_control.rst
similarity index 100%
rename from tangostationcontrol/docs/source/protection_control.rst
rename to docs/source/protection_control.rst
diff --git a/tangostationcontrol/docs/source/signal_chain.rst b/docs/source/signal_chain.rst
similarity index 97%
rename from tangostationcontrol/docs/source/signal_chain.rst
rename to docs/source/signal_chain.rst
index 8c352669450d3b9d759e4f76f8c61abf2d515bb4..037924c781f83e1b2d48389b878f912e176d221c 100644
--- a/tangostationcontrol/docs/source/signal_chain.rst
+++ b/docs/source/signal_chain.rst
@@ -109,4 +109,4 @@ XST output
 
 If the XSTs are not received at, or filled with zeroes, see also :ref:`statistics-debugging`.
 
-Each block contains 12x12 XSTs, and are indexed in the same order baselines are, see https://git.astron.nl/lofar2.0/tango/-/blob/master/tangostationcontrol/tangostationcontrol/common/baselines.py on how to convert baseline indices to and from input pairs.
+Each block contains 12x12 XSTs, and are indexed in the same order baselines are, see https://git.astron.nl/lofar2.0/tango/-/blob/master/tangostationcontrol/common/baselines.py on how to convert baseline indices to and from input pairs.
diff --git a/tangostationcontrol/docs/source/static/css/custom.css b/docs/source/static/css/custom.css
similarity index 97%
rename from tangostationcontrol/docs/source/static/css/custom.css
rename to docs/source/static/css/custom.css
index 74265d28e70a414a3a71d42efe345ec381d6c73d..05fdbd5132b3f5a6f3f436b1dfdc3ac3ef146634 100644
--- a/tangostationcontrol/docs/source/static/css/custom.css
+++ b/docs/source/static/css/custom.css
@@ -1,4 +1,4 @@
 
 .rst-content code, .rst-content tt, code {
   white-space: break-spaces;
-}
\ No newline at end of file
+}
diff --git a/tangostationcontrol/docs/source/static/drawio/logging-data-flow-diagram.drawio b/docs/source/static/drawio/logging-data-flow-diagram.drawio
similarity index 98%
rename from tangostationcontrol/docs/source/static/drawio/logging-data-flow-diagram.drawio
rename to docs/source/static/drawio/logging-data-flow-diagram.drawio
index 6cef348269c23e2dda8f5c4563475765f119a750..6e8726c84526e40b231aa7b33025d85e1ef92530 100644
--- a/tangostationcontrol/docs/source/static/drawio/logging-data-flow-diagram.drawio
+++ b/docs/source/static/drawio/logging-data-flow-diagram.drawio
@@ -1 +1 @@
-<mxfile host="app.diagrams.net" modified="2023-03-10T09:30:32.391Z" agent="5.0 (X11)" etag="04sI2TFf57dfzGZP1dRO" version="20.8.23" type="device"><diagram name="Page-1" id="wlMN7mhJMfydnIccLdaM">5V1bj6M2FP41kdqHjADbQB7bme1FaquVZqvuPnqCJ6FLQgrOTtJfXxJwAsdMQhgbm05Wmg3G3D6+c3xudibofrX7OaOb5e9pxJKJ50S7CXqYeN4s9Iu/h4Z92UAQLhsWWRyVTe654TH+l1WNTtW6jSOWNzryNE14vGk2ztP1ms15o41mWfrS7PacJs2rbuiiuqJzbnic04RJ3f6KI74sW0NS6/0LixdLcWXXqfasqOhcNeRLGqUvtSb0YYLuszTl5bfV7p4lB+wELuVxP72y93RjGVvzLgfQbPXpj3z656ffFlOOHv75lfBkGpDyNN9osq2euLpbvhcQsHX0wwHJYmue0DyP5xP045KvkqLBLb5m6XYdscNVnGKL7WL++fD9ziPV5pfaroddfWMvNtY823+ubxyPuSNi83zYcUscV94rixbwbZ1BqZrydJvN2QUkMKrYRbMF45cgO727gvMsXbHihorjXs7sEORY1ogh2jKWUB5/a94vrUi6OJ3udIWPaVw8iedU8uSK8whxEuwSpyifszqqzgZwIg+cCCNwohIH6UQFE+i+1m1z6JBfuGEHXKfJ0uJLeUaxVcP03HRk8i2sxvpY3Z3UCskZOBOTpAvBO8R9SYfbyaCcdK9cRyvpsH+ddE1SvSxjzh439PjqX4rhs8nA6nQs42x3mUEyMaoDEHhzSDCiRhwUtDDHhW+mzpIajrfDJFCxCSYPwOQGLTChNpgcXTC5rnIV1nOMfWVAd4fSfe44BmYwznl9B2Yosh6k2JgHZreD8A/NajOkHgWnMVHEaTSQsWli3O+gqIcez3ygQlqGM9dv4Y2vbdCXMHpg3+I5y0cLlTb7KJCgWtFd0XDU186KLejTnr8VuOc4Se7TJM2Ox6KIsDDCRXvOs/Qrq+0JvSfk+4qsLCCdaNaCtTckLUMJ67/zdD0t0GHvCV9tXO4QXDIs7wibVo2y1/gYr7bFuJ1m1mnHzmhpY5RwBiym1MlgN0YpVw5/cbpepNNNdrjCkm3zKdtt0uKZs9Gip49i6kPib/ZRAiNOSgWE5U4KQU0CWe+kwGjqIE6KjcFJGDJpEf3ZoHpTtr2PejN6Gi1W+rSkbDsbBwlbR6iZBFJEOX2iOYvMG3d94dKXGnDs4xSxjVOeHG+K8nm6fo4XowVLH6Nkd+Go0e/2xWObRqt31kkfXB3y5vbHQXyviav5OJMnuxT5Pk/SQmKdbbQp/rpEOG3vA2p9FJZtOOOCDlxcbDzm5MnG25LzzfQY/cznS7ai5s2Tvqjpo5ZszUkg9a0qCoyUFZU8MOa5z3DzDbvgzVlXVmTCcxcGgF0KrQkEcU1rNCRbxWXIM2M5Hy9e2nQZ8pTrMu0lvHbHIa8qIesqc00USyALw0ahZ5t9hmRLo5a6WacRsyd/0xs9bboNWzhiQpTM552xPGKeOTZevPSxqsOIadhFImFHkPSVLWPZ/U7SRc5pvixav1tk9JmuaXFq0TpNt3yz5dMk/Rp/bxzQ3vXy+mgnRzAPUBlHqi/19AGl2rIwElA7BdCsiV1i2Rbh80PI8hAsKv4jMzJ7T0DrK5brYLb0Cy+JgpGaQ9ZhJubZc/tS3/eKG1e+LDFF1lMbp+rqAJZcNeYBwsEDOm5dPUApqg4DY4o8QKlg1HEu3pfUH1/uj8nF/no8TKLaTgPq6Zkc/rWpJ//4ORyRrnmtvfwoyrBCarSMu20ZVkhFdVpLtk9Oqa1ynFCe2hrnG9A3bmhO2toF9ykaZozwci73idGDmnWIg//PTO8KvT6mdyhiVDGt/3KBrZUWkkDiqolUliKYMpF8FyhP0tdEgjMTNM2SxWAKJIKLrMD7gjbgEEF10sH17ZvMaXLcvcLxPstkaJUL1NV1KEufTMkFLJwjQU+5INfWh1EkF5DneDYEzzsUYNgfeQDI+W254EEjPOLEoBqoaEGnQPG7QFib4eKrX8zjLYaLW1fpovaos+WC5NfqO3TmBm2v1Tl+1Op0sdDOVZ1OjIaDMJhPdAqR36rTMeAz0VQQQPymreNXro5Wne5bOKETZoE6l+voy6v5spN/yqWNFS196lbjDM6R28OCR5bbw4GqZQ59kObB0IpS5SfCauWmPXxV117rb8Te9rXFW/plpJpmy21WC1Zsg3SNt5Tjmy0pKQLp33dyNNGUkkIgQOSjy3IB+4sH1Lu8qOrJ1Ea8JDj9k7SVWA3riKr27xWgBOtcjFe6i8hQfdGi7WbPWTZNqPmJ6n3x0mcMyhVpIrrhjDK60Vtu9S1ZZqPcggGrdXJt28irz4cLZck1DxMwtFuX33GH1G+hHCuj2XxZ2EDZlMcrlh/X5h8tbtqEMPTsY1cQXEdp0MUTQjnatIyeNpvpfDVasPQxSnVhiQKQQusYJceaSkZZsLZpX7D0MUp2nGTdbsXaHL3NB33YdVjY4J0Wvwj70/LiFxyC5bT7JoSkoKam4pfQGUHxi8BCg1z0ClLezWYIBCqd8GbpOO7/yLJCKR4meSpf+UH4jJbnAUK4Ar3tIhNAEQguiwzsP8gk7FmHnOuAIgPKEW6L66uuFwvHIRdwrVKxdOWtchGI6V2nGl88iFxgK+VC24/hjX8GVtcf4TE8BQvIhTRzqnPNDcznahov4JQq70q+y/AUrGLz/IOVZffzr36iD/8B</diagram></mxfile>
\ No newline at end of file
+<mxfile host="app.diagrams.net" modified="2023-03-10T09:30:32.391Z" agent="5.0 (X11)" etag="04sI2TFf57dfzGZP1dRO" version="20.8.23" type="device"><diagram name="Page-1" id="wlMN7mhJMfydnIccLdaM">5V1bj6M2FP41kdqHjADbQB7bme1FaquVZqvuPnqCJ6FLQgrOTtJfXxJwAsdMQhgbm05Wmg3G3D6+c3xudibofrX7OaOb5e9pxJKJ50S7CXqYeN4s9Iu/h4Z92UAQLhsWWRyVTe654TH+l1WNTtW6jSOWNzryNE14vGk2ztP1ms15o41mWfrS7PacJs2rbuiiuqJzbnic04RJ3f6KI74sW0NS6/0LixdLcWXXqfasqOhcNeRLGqUvtSb0YYLuszTl5bfV7p4lB+wELuVxP72y93RjGVvzLgfQbPXpj3z656ffFlOOHv75lfBkGpDyNN9osq2euLpbvhcQsHX0wwHJYmue0DyP5xP045KvkqLBLb5m6XYdscNVnGKL7WL++fD9ziPV5pfaroddfWMvNtY823+ubxyPuSNi83zYcUscV94rixbwbZ1BqZrydJvN2QUkMKrYRbMF45cgO727gvMsXbHihorjXs7sEORY1ogh2jKWUB5/a94vrUi6OJ3udIWPaVw8iedU8uSK8whxEuwSpyifszqqzgZwIg+cCCNwohIH6UQFE+i+1m1z6JBfuGEHXKfJ0uJLeUaxVcP03HRk8i2sxvpY3Z3UCskZOBOTpAvBO8R9SYfbyaCcdK9cRyvpsH+ddE1SvSxjzh439PjqX4rhs8nA6nQs42x3mUEyMaoDEHhzSDCiRhwUtDDHhW+mzpIajrfDJFCxCSYPwOQGLTChNpgcXTC5rnIV1nOMfWVAd4fSfe44BmYwznl9B2Yosh6k2JgHZreD8A/NajOkHgWnMVHEaTSQsWli3O+gqIcez3ygQlqGM9dv4Y2vbdCXMHpg3+I5y0cLlTb7KJCgWtFd0XDU186KLejTnr8VuOc4Se7TJM2Ox6KIsDDCRXvOs/Qrq+0JvSfk+4qsLCCdaNaCtTckLUMJ67/zdD0t0GHvCV9tXO4QXDIs7wibVo2y1/gYr7bFuJ1m1mnHzmhpY5RwBiym1MlgN0YpVw5/cbpepNNNdrjCkm3zKdtt0uKZs9Gip49i6kPib/ZRAiNOSgWE5U4KQU0CWe+kwGjqIE6KjcFJGDJpEf3ZoHpTtr2PejN6Gi1W+rSkbDsbBwlbR6iZBFJEOX2iOYvMG3d94dKXGnDs4xSxjVOeHG+K8nm6fo4XowVLH6Nkd+Go0e/2xWObRqt31kkfXB3y5vbHQXyviav5OJMnuxT5Pk/SQmKdbbQp/rpEOG3vA2p9FJZtOOOCDlxcbDzm5MnG25LzzfQY/cznS7ai5s2Tvqjpo5ZszUkg9a0qCoyUFZU8MOa5z3DzDbvgzVlXVmTCcxcGgF0KrQkEcU1rNCRbxWXIM2M5Hy9e2nQZ8pTrMu0lvHbHIa8qIesqc00USyALw0ahZ5t9hmRLo5a6WacRsyd/0xs9bboNWzhiQpTM552xPGKeOTZevPSxqsOIadhFImFHkPSVLWPZ/U7SRc5pvixav1tk9JmuaXFq0TpNt3yz5dMk/Rp/bxzQ3vXy+mgnRzAPUBlHqi/19AGl2rIwElA7BdCsiV1i2Rbh80PI8hAsKv4jMzJ7T0DrK5brYLb0Cy+JgpGaQ9ZhJubZc/tS3/eKG1e+LDFF1lMbp+rqAJZcNeYBwsEDOm5dPUApqg4DY4o8QKlg1HEu3pfUH1/uj8nF/no8TKLaTgPq6Zkc/rWpJ//4ORyRrnmtvfwoyrBCarSMu20ZVkhFdVpLtk9Oqa1ynFCe2hrnG9A3bmhO2toF9ykaZozwci73idGDmnWIg//PTO8KvT6mdyhiVDGt/3KBrZUWkkDiqolUliKYMpF8FyhP0tdEgjMTNM2SxWAKJIKLrMD7gjbgEEF10sH17ZvMaXLcvcLxPstkaJUL1NV1KEufTMkFLJwjQU+5INfWh1EkF5DneDYEzzsUYNgfeQDI+W254EEjPOLEoBqoaEGnQPG7QFib4eKrX8zjLYaLW1fpovaos+WC5NfqO3TmBm2v1Tl+1Op0sdDOVZ1OjIaDMJhPdAqR36rTMeAz0VQQQPymreNXro5Wne5bOKETZoE6l+voy6v5spN/yqWNFS196lbjDM6R28OCR5bbw4GqZQ59kObB0IpS5SfCauWmPXxV117rb8Te9rXFW/plpJpmy21WC1Zsg3SNt5Tjmy0pKQLp33dyNNGUkkIgQOSjy3IB+4sH1Lu8qOrJ1Ea8JDj9k7SVWA3riKr27xWgBOtcjFe6i8hQfdGi7WbPWTZNqPmJ6n3x0mcMyhVpIrrhjDK60Vtu9S1ZZqPcggGrdXJt28irz4cLZck1DxMwtFuX33GH1G+hHCuj2XxZ2EDZlMcrlh/X5h8tbtqEMPTsY1cQXEdp0MUTQjnatIyeNpvpfDVasPQxSnVhiQKQQusYJceaSkZZsLZpX7D0MUp2nGTdbsXaHL3NB33YdVjY4J0Wvwj70/LiFxyC5bT7JoSkoKam4pfQGUHxi8BCg1z0ClLezWYIBCqd8GbpOO7/yLJCKR4meSpf+UH4jJbnAUK4Ar3tIhNAEQguiwzsP8gk7FmHnOuAIgPKEW6L66uuFwvHIRdwrVKxdOWtchGI6V2nGl88iFxgK+VC24/hjX8GVtcf4TE8BQvIhTRzqnPNDcznahov4JQq70q+y/AUrGLz/IOVZffzr36iD/8B</diagram></mxfile>
diff --git a/tangostationcontrol/docs/source/static/drawio/station-services.drawio b/docs/source/static/drawio/station-services.drawio
similarity index 98%
rename from tangostationcontrol/docs/source/static/drawio/station-services.drawio
rename to docs/source/static/drawio/station-services.drawio
index 8b2e275beca7e8b53a1d6d5c4cc288c942b3102d..0318de949248b2b3b802657e6cd15764de41bb84 100644
--- a/tangostationcontrol/docs/source/static/drawio/station-services.drawio
+++ b/docs/source/static/drawio/station-services.drawio
@@ -1 +1 @@
-<mxfile host="app.diagrams.net" modified="2023-06-28T15:06:35.379Z" agent="5.0 (X11)" etag="apX0cssMlA21AJgRY9xc" version="20.8.23" type="device"><diagram name="Page-1" id="ZeZ0B45kNNhrmJt5RdN_">7V3RkqO2Ev2aqUoeZgskAfbj7sxmU6mdm0l5U0num8YIm7sYTWHNjidfH2GDbVrYBoyQyN3ZhzWyLODQR93qbjU3+G61+ZTR5+UDD1lyg5xwc4PvbxBCDkHyv7zlbdfilw2LLA53Te6hYRb/zYpGp2h9iUO2rnQUnCcifq42znmasrmotNEs46/VbhFPqmd9pgumNMzmNFFb/4hDsdy1Tjzn0P4zixfL8syuU3yzomXnomG9pCF/PWrCH2/wXca52H1abe5YkoNX4rL73U8nvt1fWMZS0eQHUYTST19dwX65ixw3TL/88ejeertRvtHkpbjh4mLFW4lAxl/SkOWDODf4w+syFmz2TOf5t6/ymcu2pVgl8siVH6M4Se54wrPtb/FP2z/Zrl5scf3fWCbY5qipuPhPjK+YyN5kl/LbEshCkvbAvh6ei4+LtuXRMyFlIy1kYbEf+wCX/FAg1gI9VIOen8jTfgjjb/LjQmxvfdf0lMEWec5Kvx6B/7j91xPwBABPVOBdrwZ4d6ILeKxXbPtED9uHnt9EbGeCipinst+MR+JVQiA//uDlP8zPjhzPz2/yRx3CrGO2cBrOFkgX6oGC+h1PRcYT81h1FVFtWE0UrGaCZ7mqNo1VZzprw2o6nrnQ8zuCh6e60CMKeg88jaWwxenCuLB1xkubsJVm+RFe0vCPaErNgxV4FbBwUAMWqgGLaAPLVcB6zPKxl+xlbR1epMaeHhgv1Z5+iNOYG4cKe1WokHnRGpEFDM0L4jWcxfRZwK467X/mi4UNc35ntPTN+aqTQIK1FnS9NI8WYCaZGmemurr6zL/G1iHlmZ/D1BWRoOmC3z7vleQt2zxzeYeZcfigtrRABdQtkso1+35p6fzw+PYlR/XH6yBcZDSMJXz3ccbm25Pg+7yJJqryCCmbRHPZvpbX8JUdfePPJ+wp0iPQaGL8iahLsV9ent9sEF8IFvZNg1We7JwFw9Lwfe7Dl0fzhK7X8bwKTBVFtonFn/nnd9NpUBz/tT32yLQ4vt8cdb5/Ozp4ZFks74xlZZsk0NufxYm2B7ux5DxQHB/G2h6VgylC72z/9t+UYYTcugqlDt1e/9nHvOYv2Zw1mEkFzRZMnOtYjMjCStRDFZsjsaizNcq2jCVyxvlWjZXUiUpxhkcey3vbS2XgAVvHBdK2u/PiVweBUwaaONWB9uJdDrRDRhlIShd9O+r2nHdYn7lgXD0PmqKz1wX7Y89p1Z9U+8sPuys+0G7/zK5gorpM7YuJVRae52DJN6fKt2Z0OybVaQL2RbcyEHmRbo5ddAuANMLJvTHdoHMduud6opsHLpiQ8/Tx4NqpZf/SzaiXbqqXY9R0u4JH06Y8mtjFIyA1QUcawRgVhkv4nmiknGdynhZKf2cIWjTwaLWkxV7ED1L9V0Wo60X8YEd6R4Ryz9LJhNHnNWWPbxV7gInjweyM5jZfda6HzsIT5OlNXlUX4oimcbBiZ55LHFNy7I/TmnKB/EEbqKkc+/U2i24l4E3bKYGLthTEo2X/YWwv1ZWd8pDZ62Ykxt2MqC5bqJd5zu0yz43AG4MaK2a7vDEEOh+gE6XpjEagaoZuHU3eGHJhSjPjXWkQ5YjoWtg7B2HjiQFIDXV8n4POz0Fj9Qg7QP85uNscBAcayiOML5g94/AIq4Gs7ZwVPhmfnGAqjvksL9zAfT40SrfTqtTUZT+7fg1KLlTV/cGkxvs+bqS6S6n5BOjOcGnLucFIQevLw2xmHing+6zNSB2Wfv37Da+xDQy600uZGZs7XclN6OpJcQkYyNGj8+Fs4Z9X4aA78KardwEdI0N433EDb6YtGwGDSYPZelIjr1jffjTVr3SXEz3XbY5FGwo6Q6dP0anupaRILrV3RewZXxFj1atwrdbrqMG6aEubo2XYrmgZQkD0uuZsKAM1jJe1VY4YpGKVfv5T1wX7+y1zNtr298gQ6tQKh1VnmnX2dHXnJ24cBbTLYYUmVVr50OZsyk9FxwzksPJaOqwGcUCVnNXNHzTUqq4vLTZpypLAKpa4fl9LPDiQptAS1EroQmhJ6Y/baaXW/YeIlhNticH/JyxEdrEQ6iqFPI11FRxIk6PFdhbiIWzJsmCWJYlm3YKfg+bnl+GrsTlCIa32W3+v5SfRxU8YzLzET9jfHYI/2gIE/1b+lHUYxsYf3JeVqShKTYn5kA8X9ZsR/tSUyLGiKsfEhdq7eGrGvLJEDQPUVFY7rgFjZe00CKz5HAuiRgke4lWc2QdVXUBlWKjUyIAtFZogWMR48gBR/bSPXOpXNvvts3Vw7TPmzcHVoNZcO1Oqs3Vzyp7qFq4KzhtvJx/mRVOKNHVrE7tcBSep2nqX1oltHr3nZIBSAvjCUl7pf8H0gv2JP4DpVZ7TBr51WPNcQRu7FhZTuK+8a5BHoZWuIA/IOfIusAH2H0a6e3cvX69N8tox1c3C7wjuplOaeLVh0ZkhFA2xmlqda1IoHIW78nUpmgv5DbA/8tAA1EL2UGtYxeHZLd3QkdTZjNLkkYKK4JJZpPRHQyiO3j26fSgOx5kAxeGRwRTHqf383ZnUuMgRsSthDtYm6m6rwSoosFBFX5SDBQAu2Wr+WcpZQtHeq2P0HwexRGBvQU72fofblYUklHF6kleo0orT6BUn1f97TwWNEik9yIkyvpL/JSzKL1Pw/JlsHxOUOME2oipjVRlKecrAZFo00SRe5CVP51KI8kn3Q+7Gi+c0eV98sYrDMD9NrV+wKsknBbLFNiwoM3XlPEmNzGp7FZLXe0J6G8KPjeMEoXf9sLxmJD08P5xIL9NVj/yhlvF3vu8fRvCuJtg5LOPVYMD/1jy9Xc+XbEXNv99C2SlufNNOSd3vmShNFyGljI09E6XzIsRUJsqlMhZGMlH8vistDPjaPxLUzNe1Lz2BZnt/0w9S4PuZZmHxar84V3RRjpTxibsrdNo2qfqqw+nXx7vf3/cqfRENA1r71oQn4nsO0aMVzScV+Ora7r/06SnejBBdZROX8cwpX12Xzf7z8DhCbBXJNY9t3S5PJd1vRVO6kMgi5ym/G6n4T6X9KT8VjK505AiWL3MBi56z73jp4QnC4jHmi1sGqkUOHlcYRxHb3rO0QrePY3TEgbB7xt+RFaiWiIJr13e/NK/ZbUPNnsZbyUoTxJIFDnwxaecS+APt50QuOM+l9Q0M/rTsDxJu9KyHAn07W/61NLIrzRIW5VBijE15BB0OSpmQsfJoiH3OgRqsXLMkyqUgi4Vg6VYEI7FbKfdheNnzFj3FOMD6jAN5mHEujh+eRGj5wEOW9/gH</diagram></mxfile>
\ No newline at end of file
+<mxfile host="app.diagrams.net" modified="2023-06-28T15:06:35.379Z" agent="5.0 (X11)" etag="apX0cssMlA21AJgRY9xc" version="20.8.23" type="device"><diagram name="Page-1" id="ZeZ0B45kNNhrmJt5RdN_">7V3RkqO2Ev2aqUoeZgskAfbj7sxmU6mdm0l5U0num8YIm7sYTWHNjidfH2GDbVrYBoyQyN3ZhzWyLODQR93qbjU3+G61+ZTR5+UDD1lyg5xwc4PvbxBCDkHyv7zlbdfilw2LLA53Te6hYRb/zYpGp2h9iUO2rnQUnCcifq42znmasrmotNEs46/VbhFPqmd9pgumNMzmNFFb/4hDsdy1Tjzn0P4zixfL8syuU3yzomXnomG9pCF/PWrCH2/wXca52H1abe5YkoNX4rL73U8nvt1fWMZS0eQHUYTST19dwX65ixw3TL/88ejeertRvtHkpbjh4mLFW4lAxl/SkOWDODf4w+syFmz2TOf5t6/ymcu2pVgl8siVH6M4Se54wrPtb/FP2z/Zrl5scf3fWCbY5qipuPhPjK+YyN5kl/LbEshCkvbAvh6ei4+LtuXRMyFlIy1kYbEf+wCX/FAg1gI9VIOen8jTfgjjb/LjQmxvfdf0lMEWec5Kvx6B/7j91xPwBABPVOBdrwZ4d6ILeKxXbPtED9uHnt9EbGeCipinst+MR+JVQiA//uDlP8zPjhzPz2/yRx3CrGO2cBrOFkgX6oGC+h1PRcYT81h1FVFtWE0UrGaCZ7mqNo1VZzprw2o6nrnQ8zuCh6e60CMKeg88jaWwxenCuLB1xkubsJVm+RFe0vCPaErNgxV4FbBwUAMWqgGLaAPLVcB6zPKxl+xlbR1epMaeHhgv1Z5+iNOYG4cKe1WokHnRGpEFDM0L4jWcxfRZwK467X/mi4UNc35ntPTN+aqTQIK1FnS9NI8WYCaZGmemurr6zL/G1iHlmZ/D1BWRoOmC3z7vleQt2zxzeYeZcfigtrRABdQtkso1+35p6fzw+PYlR/XH6yBcZDSMJXz3ccbm25Pg+7yJJqryCCmbRHPZvpbX8JUdfePPJ+wp0iPQaGL8iahLsV9ent9sEF8IFvZNg1We7JwFw9Lwfe7Dl0fzhK7X8bwKTBVFtonFn/nnd9NpUBz/tT32yLQ4vt8cdb5/Ozp4ZFks74xlZZsk0NufxYm2B7ux5DxQHB/G2h6VgylC72z/9t+UYYTcugqlDt1e/9nHvOYv2Zw1mEkFzRZMnOtYjMjCStRDFZsjsaizNcq2jCVyxvlWjZXUiUpxhkcey3vbS2XgAVvHBdK2u/PiVweBUwaaONWB9uJdDrRDRhlIShd9O+r2nHdYn7lgXD0PmqKz1wX7Y89p1Z9U+8sPuys+0G7/zK5gorpM7YuJVRae52DJN6fKt2Z0OybVaQL2RbcyEHmRbo5ddAuANMLJvTHdoHMduud6opsHLpiQ8/Tx4NqpZf/SzaiXbqqXY9R0u4JH06Y8mtjFIyA1QUcawRgVhkv4nmiknGdynhZKf2cIWjTwaLWkxV7ED1L9V0Wo60X8YEd6R4Ryz9LJhNHnNWWPbxV7gInjweyM5jZfda6HzsIT5OlNXlUX4oimcbBiZ55LHFNy7I/TmnKB/EEbqKkc+/U2i24l4E3bKYGLthTEo2X/YWwv1ZWd8pDZ62Ykxt2MqC5bqJd5zu0yz43AG4MaK2a7vDEEOh+gE6XpjEagaoZuHU3eGHJhSjPjXWkQ5YjoWtg7B2HjiQFIDXV8n4POz0Fj9Qg7QP85uNscBAcayiOML5g94/AIq4Gs7ZwVPhmfnGAqjvksL9zAfT40SrfTqtTUZT+7fg1KLlTV/cGkxvs+bqS6S6n5BOjOcGnLucFIQevLw2xmHing+6zNSB2Wfv37Da+xDQy600uZGZs7XclN6OpJcQkYyNGj8+Fs4Z9X4aA78KardwEdI0N433EDb6YtGwGDSYPZelIjr1jffjTVr3SXEz3XbY5FGwo6Q6dP0anupaRILrV3RewZXxFj1atwrdbrqMG6aEubo2XYrmgZQkD0uuZsKAM1jJe1VY4YpGKVfv5T1wX7+y1zNtr298gQ6tQKh1VnmnX2dHXnJ24cBbTLYYUmVVr50OZsyk9FxwzksPJaOqwGcUCVnNXNHzTUqq4vLTZpypLAKpa4fl9LPDiQptAS1EroQmhJ6Y/baaXW/YeIlhNticH/JyxEdrEQ6iqFPI11FRxIk6PFdhbiIWzJsmCWJYlm3YKfg+bnl+GrsTlCIa32W3+v5SfRxU8YzLzET9jfHYI/2gIE/1b+lHUYxsYf3JeVqShKTYn5kA8X9ZsR/tSUyLGiKsfEhdq7eGrGvLJEDQPUVFY7rgFjZe00CKz5HAuiRgke4lWc2QdVXUBlWKjUyIAtFZogWMR48gBR/bSPXOpXNvvts3Vw7TPmzcHVoNZcO1Oqs3Vzyp7qFq4KzhtvJx/mRVOKNHVrE7tcBSep2nqX1oltHr3nZIBSAvjCUl7pf8H0gv2JP4DpVZ7TBr51WPNcQRu7FhZTuK+8a5BHoZWuIA/IOfIusAH2H0a6e3cvX69N8tox1c3C7wjuplOaeLVh0ZkhFA2xmlqda1IoHIW78nUpmgv5DbA/8tAA1EL2UGtYxeHZLd3QkdTZjNLkkYKK4JJZpPRHQyiO3j26fSgOx5kAxeGRwRTHqf383ZnUuMgRsSthDtYm6m6rwSoosFBFX5SDBQAu2Wr+WcpZQtHeq2P0HwexRGBvQU72fofblYUklHF6kleo0orT6BUn1f97TwWNEik9yIkyvpL/JSzKL1Pw/JlsHxOUOME2oipjVRlKecrAZFo00SRe5CVP51KI8kn3Q+7Gi+c0eV98sYrDMD9NrV+wKsknBbLFNiwoM3XlPEmNzGp7FZLXe0J6G8KPjeMEoXf9sLxmJD08P5xIL9NVj/yhlvF3vu8fRvCuJtg5LOPVYMD/1jy9Xc+XbEXNv99C2SlufNNOSd3vmShNFyGljI09E6XzIsRUJsqlMhZGMlH8vistDPjaPxLUzNe1Lz2BZnt/0w9S4PuZZmHxar84V3RRjpTxibsrdNo2qfqqw+nXx7vf3/cqfRENA1r71oQn4nsO0aMVzScV+Ora7r/06SnejBBdZROX8cwpX12Xzf7z8DhCbBXJNY9t3S5PJd1vRVO6kMgi5ym/G6n4T6X9KT8VjK505AiWL3MBi56z73jp4QnC4jHmi1sGqkUOHlcYRxHb3rO0QrePY3TEgbB7xt+RFaiWiIJr13e/NK/ZbUPNnsZbyUoTxJIFDnwxaecS+APt50QuOM+l9Q0M/rTsDxJu9KyHAn07W/61NLIrzRIW5VBijE15BB0OSpmQsfJoiH3OgRqsXLMkyqUgi4Vg6VYEI7FbKfdheNnzFj3FOMD6jAN5mHEujh+eRGj5wEOW9/gH</diagram></mxfile>
diff --git a/tangostationcontrol/docs/source/static/images/logging-data-flow.png b/docs/source/static/images/logging-data-flow.png
similarity index 100%
rename from tangostationcontrol/docs/source/static/images/logging-data-flow.png
rename to docs/source/static/images/logging-data-flow.png
diff --git a/tangostationcontrol/docs/source/static/images/pycharm-integration-test.png b/docs/source/static/images/pycharm-integration-test.png
similarity index 100%
rename from tangostationcontrol/docs/source/static/images/pycharm-integration-test.png
rename to docs/source/static/images/pycharm-integration-test.png
diff --git a/tangostationcontrol/docs/source/static/images/station-services.png b/docs/source/static/images/station-services.png
similarity index 100%
rename from tangostationcontrol/docs/source/static/images/station-services.png
rename to docs/source/static/images/station-services.png
diff --git a/infra/README.md b/infra/README.md
index df2790843d3b7133626bf27f859d87f9b10edee9..63e9dbc54e1e4dddc88711cc53eb3bdc38b04e0f 100644
--- a/infra/README.md
+++ b/infra/README.md
@@ -27,10 +27,10 @@ Before the LCU gets into the field, you want to configure some things:
 #### Create configuration files
 
 1. Create CDB files:
-    1. Generate the station-specific config from LOFAR1 using `generate_cdb_from_lofar1.py -s CS123` [Script location](../tangostationcontrol/tangostationcontrol/toolkit/generate_cdb_from_lofar1.py).
+    1. Generate the station-specific config from LOFAR1 using `generate_cdb_from_lofar1.py -s CS123` [Script location](../tangostationcontrol/toolkit/generate_cdb_from_lofar1.py).
     2. Make any adjustments needed, and add the file as `cs123.json` to [CDB/stations/](../CDB/stations/).
 2. Create Calibration tables:
-    1. Generate them from LOFAR1 using `generate_caltable_from_lofar1.py -s CS123`. [Script location](../tangostationcontrol/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py).
+    1. Generate them from LOFAR1 using `generate_caltable_from_lofar1.py -s CS123`. [Script location](../tangostationcontrol/toolkit/generate_caltable_from_lofar1.py).
     2. Go to http://filefish.lofar.net/ (credentials: minioadmin/minioadmin).
     3. Create a `CS123` path in that bucket, and upload the HDF5 files to that.
 
diff --git a/tangostationcontrol/integration_test/README.md b/integration_tests/README.md
similarity index 100%
rename from tangostationcontrol/integration_test/README.md
rename to integration_tests/README.md
diff --git a/tangostationcontrol/integration_test/__init__.py b/integration_tests/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/__init__.py
rename to integration_tests/__init__.py
diff --git a/tangostationcontrol/integration_test/base.py b/integration_tests/base.py
similarity index 94%
rename from tangostationcontrol/integration_test/base.py
rename to integration_tests/base.py
index d3e613f61d60b1976d4c5254b0c171b5eb78a888..9005d6174ee0c7dbeec546944af2817933685dff 100644
--- a/tangostationcontrol/integration_test/base.py
+++ b/integration_tests/base.py
@@ -9,7 +9,7 @@ import testscenarios
 
 from tangostationcontrol.common.lofar_logging import configure_logger
 
-from integration_test.reset_fixture import reset_exported_devices
+from integration_tests.reset_fixture import reset_exported_devices
 
 """Setup logging for integration tests"""
 configure_logger(debug=True)
diff --git a/tangostationcontrol/integration_test/common/__init__.py b/integration_tests/common/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/common/__init__.py
rename to integration_tests/common/__init__.py
diff --git a/tangostationcontrol/integration_test/common/base_device_classes/__init__.py b/integration_tests/common/base_device_classes/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/common/base_device_classes/__init__.py
rename to integration_tests/common/base_device_classes/__init__.py
diff --git a/tangostationcontrol/integration_test/common/base_device_classes/power_hierarchy_tests.py b/integration_tests/common/base_device_classes/power_hierarchy_tests.py
similarity index 99%
rename from tangostationcontrol/integration_test/common/base_device_classes/power_hierarchy_tests.py
rename to integration_tests/common/base_device_classes/power_hierarchy_tests.py
index d10330e6b169807202d337ada85a607e8934bff0..56dc57134a58795591658405712b11463332b00b 100644
--- a/tangostationcontrol/integration_test/common/base_device_classes/power_hierarchy_tests.py
+++ b/integration_tests/common/base_device_classes/power_hierarchy_tests.py
@@ -8,8 +8,8 @@ import logging
 
 from tango import DevState, DeviceProxy
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 from lofar_lotus.dict import CaseInsensitiveString
 from tangostationcontrol.common.constants import N_rcu, N_rcu_inp
 from tangostationcontrol.devices.base_device_classes.hierarchy_device import (
diff --git a/tangostationcontrol/integration_test/common/device_beamlet_tests.py b/integration_tests/common/device_beamlet_tests.py
similarity index 98%
rename from tangostationcontrol/integration_test/common/device_beamlet_tests.py
rename to integration_tests/common/device_beamlet_tests.py
index e4f05f623d9dcc55b214fe85e64e943a400e49a3..5860e07623f5d18c66ce32eaffa6ce6ed93e4c34 100644
--- a/tangostationcontrol/integration_test/common/device_beamlet_tests.py
+++ b/integration_tests/common/device_beamlet_tests.py
@@ -7,7 +7,7 @@ from ctypes import c_short
 import numpy
 import numpy.testing
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 from tango import DevState
 from tangostationcontrol.common.constants import (
diff --git a/tangostationcontrol/integration_test/common/device_bst_tests.py b/integration_tests/common/device_bst_tests.py
similarity index 93%
rename from tangostationcontrol/integration_test/common/device_bst_tests.py
rename to integration_tests/common/device_bst_tests.py
index ac2b01e1fcda002801e8162080310a6fe09482db..2b5fcd7a97e7c487866693749f654868cafb01b8 100644
--- a/tangostationcontrol/integration_test/common/device_bst_tests.py
+++ b/integration_tests/common/device_bst_tests.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class BSTDeviceTests(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/common/device_digitalbeam_tests.py b/integration_tests/common/device_digitalbeam_tests.py
similarity index 98%
rename from tangostationcontrol/integration_test/common/device_digitalbeam_tests.py
rename to integration_tests/common/device_digitalbeam_tests.py
index 1df9562ae52f7d88d0d7f3670ab0424cc9559cf1..6966ef61529f1388bd2d3308cb7529cf201221a0 100644
--- a/tangostationcontrol/integration_test/common/device_digitalbeam_tests.py
+++ b/integration_tests/common/device_digitalbeam_tests.py
@@ -7,8 +7,8 @@ import time
 import numpy
 import pytest
 
-from integration_test.device_proxy import TestDeviceProxy
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.device_proxy import TestDeviceProxy
+from integration_tests.default.devices.base import TestDeviceBase
 from tangostationcontrol.common.constants import (
     MAX_ANTENNA,
     N_beamlets_ctrl,
diff --git a/tangostationcontrol/integration_test/common/device_hba_tests.py b/integration_tests/common/device_hba_tests.py
similarity index 99%
rename from tangostationcontrol/integration_test/common/device_hba_tests.py
rename to integration_tests/common/device_hba_tests.py
index 6a77499c283ef5c414f4369c5905125c203c2e82..0aee07b473ac6c5a2a78345123b3fa58a765bf3d 100644
--- a/tangostationcontrol/integration_test/common/device_hba_tests.py
+++ b/integration_tests/common/device_hba_tests.py
@@ -5,7 +5,7 @@ import logging
 import time
 import numpy
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 from tango import DevState
 
 from tangostationcontrol.common.constants import (
diff --git a/tangostationcontrol/integration_test/common/device_observation_control_tests.py b/integration_tests/common/device_observation_control_tests.py
similarity index 99%
rename from tangostationcontrol/integration_test/common/device_observation_control_tests.py
rename to integration_tests/common/device_observation_control_tests.py
index 30ff14af6aa9a9c58aece120b92bf40b2989174d..3702933252d9b3083d8148c33e1473aadf1e7fd7 100644
--- a/tangostationcontrol/integration_test/common/device_observation_control_tests.py
+++ b/integration_tests/common/device_observation_control_tests.py
@@ -11,7 +11,7 @@ from datetime import timedelta
 import numpy
 import pytest
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 from tango import DevFailed, DevState
 
 from tangostationcontrol.common.constants import CS001_TILES
diff --git a/tangostationcontrol/integration_test/common/device_sdp_tests.py b/integration_tests/common/device_sdp_tests.py
similarity index 88%
rename from tangostationcontrol/integration_test/common/device_sdp_tests.py
rename to integration_tests/common/device_sdp_tests.py
index 7284cd8878d8350e9ac8b44e4d4bc7777fd3e702..09a472c0f849f5349ff11d1f4bf28075d6e17436 100644
--- a/tangostationcontrol/integration_test/common/device_sdp_tests.py
+++ b/integration_tests/common/device_sdp_tests.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class SDPDeviceTests(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/common/device_sdpfirmware_tests.py b/integration_tests/common/device_sdpfirmware_tests.py
similarity index 93%
rename from tangostationcontrol/integration_test/common/device_sdpfirmware_tests.py
rename to integration_tests/common/device_sdpfirmware_tests.py
index 84ed6791d7b6b76c593a6a8373652809cd1a3e45..757c3af24cecc8226e947ffbb6d6883408409980 100644
--- a/tangostationcontrol/integration_test/common/device_sdpfirmware_tests.py
+++ b/integration_tests/common/device_sdpfirmware_tests.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 from tangostationcontrol.common.constants import N_pn
 from tangostationcontrol.common.env_decorators import ensure_device_boots
diff --git a/tangostationcontrol/integration_test/common/device_sst_tests.py b/integration_tests/common/device_sst_tests.py
similarity index 95%
rename from tangostationcontrol/integration_test/common/device_sst_tests.py
rename to integration_tests/common/device_sst_tests.py
index b1850d7cbe68012c51d7ff6903784a282f9a2f0f..6bdab2ca653adc5bf5c8442180221c82aa490bc7 100644
--- a/tangostationcontrol/integration_test/common/device_sst_tests.py
+++ b/integration_tests/common/device_sst_tests.py
@@ -3,7 +3,7 @@
 
 import socket
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 from tangostationcontrol.common.env_decorators import ensure_device_boots
 
 from tango import DevState
diff --git a/tangostationcontrol/integration_test/common/device_tilebeam_tests.py b/integration_tests/common/device_tilebeam_tests.py
similarity index 98%
rename from tangostationcontrol/integration_test/common/device_tilebeam_tests.py
rename to integration_tests/common/device_tilebeam_tests.py
index 2c3a23dd29156bce31b2e2cfbd81366ffbd9ff37..ec2d0bed2d748d38e81768ffd12dfa03f744c47a 100644
--- a/tangostationcontrol/integration_test/common/device_tilebeam_tests.py
+++ b/integration_tests/common/device_tilebeam_tests.py
@@ -9,8 +9,8 @@ import time
 import numpy
 import pytest
 
-from integration_test.device_proxy import TestDeviceProxy
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.device_proxy import TestDeviceProxy
+from integration_tests.default.devices.base import TestDeviceBase
 
 from tangostationcontrol.common.constants import (
     CS001_TILES,
diff --git a/tangostationcontrol/integration_test/common/device_xst_tests.py b/integration_tests/common/device_xst_tests.py
similarity index 89%
rename from tangostationcontrol/integration_test/common/device_xst_tests.py
rename to integration_tests/common/device_xst_tests.py
index 5f263fe80a1efed00ed8bea8a0cecb50327a3c11..9294816f1cb283a5356fef3abb6ba87486405f26 100644
--- a/tangostationcontrol/integration_test/common/device_xst_tests.py
+++ b/integration_tests/common/device_xst_tests.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class XSTDeviceTests(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/configuration/__init__.py b/integration_tests/configuration/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/__init__.py
rename to integration_tests/configuration/__init__.py
diff --git a/tangostationcontrol/integration_test/configuration/configDB/LOFAR_ConfigDb.json b/integration_tests/configuration/configDB/LOFAR_ConfigDb.json
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/configDB/LOFAR_ConfigDb.json
rename to integration_tests/configuration/configDB/LOFAR_ConfigDb.json
diff --git a/tangostationcontrol/integration_test/configuration/configDB/__init__.py b/integration_tests/configuration/configDB/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/configDB/__init__.py
rename to integration_tests/configuration/configDB/__init__.py
diff --git a/tangostationcontrol/integration_test/configuration/configDB/dummy_positions_ConfigDb.json b/integration_tests/configuration/configDB/dummy_positions_ConfigDb.json
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/configDB/dummy_positions_ConfigDb.json
rename to integration_tests/configuration/configDB/dummy_positions_ConfigDb.json
diff --git a/tangostationcontrol/integration_test/configuration/configDB/simulators_ConfigDb.json b/integration_tests/configuration/configDB/simulators_ConfigDb.json
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/configDB/simulators_ConfigDb.json
rename to integration_tests/configuration/configDB/simulators_ConfigDb.json
diff --git a/tangostationcontrol/integration_test/configuration/configDB/test_environment_ConfigDb.json b/integration_tests/configuration/configDB/test_environment_ConfigDb.json
similarity index 100%
rename from tangostationcontrol/integration_test/configuration/configDB/test_environment_ConfigDb.json
rename to integration_tests/configuration/configDB/test_environment_ConfigDb.json
diff --git a/tangostationcontrol/integration_test/configuration/test_device_configuration.py b/integration_tests/configuration/test_device_configuration.py
similarity index 99%
rename from tangostationcontrol/integration_test/configuration/test_device_configuration.py
rename to integration_tests/configuration/test_device_configuration.py
index ede698fcd87e3a7897c501bf38246135d6f5114e..d96557d66750970ecf249d7ed8d79269db2d2a40 100644
--- a/tangostationcontrol/integration_test/configuration/test_device_configuration.py
+++ b/integration_tests/configuration/test_device_configuration.py
@@ -10,7 +10,7 @@ try:
 except ImportError:
     from importlib_resources import files  # type: ignore
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 from lofar_lotus.dict import CaseInsensitiveDict
 from lofar_lotus.dict import CaseInsensitiveString
 
diff --git a/tangostationcontrol/integration_test/default/__init__.py b/integration_tests/default/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/__init__.py
rename to integration_tests/default/__init__.py
diff --git a/tangostationcontrol/integration_test/default/client/__init__.py b/integration_tests/default/client/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/client/__init__.py
rename to integration_tests/default/client/__init__.py
diff --git a/tangostationcontrol/integration_test/default/client/test_opcua_client_against_server.py b/integration_tests/default/client/test_opcua_client_against_server.py
similarity index 96%
rename from tangostationcontrol/integration_test/default/client/test_opcua_client_against_server.py
rename to integration_tests/default/client/test_opcua_client_against_server.py
index 03d5bc431697aaaad22cd9a549f4aa63bae41e91..d125c7346c67e0220f4c7f7077b33848801c7036 100644
--- a/tangostationcontrol/integration_test/default/client/test_opcua_client_against_server.py
+++ b/integration_tests/default/client/test_opcua_client_against_server.py
@@ -11,7 +11,7 @@ from tangostationcontrol.clients.opcua_client import (
     OPCUAConnectionStatus,
 )
 
-from integration_test import base
+from integration_tests import base
 
 
 class TestClientServer(base.IntegrationAsyncTestCase):
@@ -36,7 +36,7 @@ class TestClientServer(base.IntegrationAsyncTestCase):
         obj = self.server.get_objects_node()
 
         # add double_R/double_RW
-        double_R = await obj.add_variable(idx, "double_R", 42.0)
+        await obj.add_variable(idx, "double_R", 42.0)
         double_RW = await obj.add_variable(idx, "double_RW", 42.0)
         await double_RW.set_writable()
 
@@ -57,15 +57,15 @@ class TestClientServer(base.IntegrationAsyncTestCase):
             be caught"""
             raise ArithmeticError("Expected test exception")
 
-        multiply_method = await obj.add_method(
+        await obj.add_method(
             idx,
             "multiply",
             multiply,
             [asyncua.ua.VariantType.Double, asyncua.ua.VariantType.Int64],
             [asyncua.ua.VariantType.Double],
         )
-        procedure_method = await obj.add_method(idx, "procedure", procedure, [], [])
-        throws_method = await obj.add_method(idx, "throws", throws, [], [])
+        await obj.add_method(idx, "procedure", procedure, [], [])
+        await obj.add_method(idx, "throws", throws, [], [])
 
         # run the server
         await self.server.start()
diff --git a/tangostationcontrol/integration_test/default/client/test_sdptr_sim.py b/integration_tests/default/client/test_sdptr_sim.py
similarity index 94%
rename from tangostationcontrol/integration_test/default/client/test_sdptr_sim.py
rename to integration_tests/default/client/test_sdptr_sim.py
index 711d27556384892a6d5971aeda1196e74df0aaec..e9e591232852b874e5873f1f49552acbd144b722 100644
--- a/tangostationcontrol/integration_test/default/client/test_sdptr_sim.py
+++ b/integration_tests/default/client/test_sdptr_sim.py
@@ -3,7 +3,7 @@
 
 from asyncua import Client
 
-from integration_test import base
+from integration_tests import base
 
 
 class TestSDPTRSim(base.IntegrationAsyncTestCase):
diff --git a/tangostationcontrol/integration_test/default/client/test_unb2_sim.py b/integration_tests/default/client/test_unb2_sim.py
similarity index 94%
rename from tangostationcontrol/integration_test/default/client/test_unb2_sim.py
rename to integration_tests/default/client/test_unb2_sim.py
index 72ff598e04ced1e553f6a66c7717bc988e3a0635..c4d11c76d815ec4db13570f722aa55cae3c71872 100644
--- a/tangostationcontrol/integration_test/default/client/test_unb2_sim.py
+++ b/integration_tests/default/client/test_unb2_sim.py
@@ -3,7 +3,7 @@
 
 from asyncua import Client
 
-from integration_test import base
+from integration_tests import base
 
 
 class TestUNB2Sim(base.IntegrationAsyncTestCase):
diff --git a/tangostationcontrol/integration_test/default/common/__init__.py b/integration_tests/default/common/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/common/__init__.py
rename to integration_tests/default/common/__init__.py
diff --git a/tangostationcontrol/integration_test/default/common/test_configuration.py b/integration_tests/default/common/test_configuration.py
similarity index 99%
rename from tangostationcontrol/integration_test/default/common/test_configuration.py
rename to integration_tests/default/common/test_configuration.py
index 97838eadeb1704e9888ebeb9a6a74ad8a7dc8c1f..25cd09c7d021b7a3e3375db5716bcae89dfba228 100644
--- a/tangostationcontrol/integration_test/default/common/test_configuration.py
+++ b/integration_tests/default/common/test_configuration.py
@@ -4,7 +4,7 @@
 import json
 
 from jsonschema.exceptions import ValidationError
-from integration_test.base import BaseIntegrationTestCase
+from integration_tests.base import BaseIntegrationTestCase
 from tango import Database
 
 from tangostationcontrol.common.configuration import StationConfiguration
diff --git a/tangostationcontrol/integration_test/default/common/test_env_decorators.py b/integration_tests/default/common/test_env_decorators.py
similarity index 98%
rename from tangostationcontrol/integration_test/default/common/test_env_decorators.py
rename to integration_tests/default/common/test_env_decorators.py
index e9e69e2bf9933b918eeaacd00c28a2454df38bee..8af5ded56b3601811a142bfd5bd702efc74d55bf 100644
--- a/tangostationcontrol/integration_test/default/common/test_env_decorators.py
+++ b/integration_tests/default/common/test_env_decorators.py
@@ -1,8 +1,8 @@
 # Copyright (C) 2023 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 from tango import DevState
 from tangostationcontrol.common.env_decorators import (
diff --git a/tangostationcontrol/integration_test/default/devices/__init__.py b/integration_tests/default/devices/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/devices/__init__.py
rename to integration_tests/default/devices/__init__.py
diff --git a/tangostationcontrol/integration_test/default/devices/antennafield/__init__.py b/integration_tests/default/devices/antennafield/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/devices/antennafield/__init__.py
rename to integration_tests/default/devices/antennafield/__init__.py
diff --git a/tangostationcontrol/integration_test/default/devices/antennafield/test_device_hba.py b/integration_tests/default/devices/antennafield/test_device_hba.py
similarity index 87%
rename from tangostationcontrol/integration_test/default/devices/antennafield/test_device_hba.py
rename to integration_tests/default/devices/antennafield/test_device_hba.py
index 1478a4131a557bd478e10c0b0abed1230b964d56..0b370bf00129e831713ee640d7ad288e5d5fe3a0 100644
--- a/tangostationcontrol/integration_test/default/devices/antennafield/test_device_hba.py
+++ b/integration_tests/default/devices/antennafield/test_device_hba.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import CS001_TILES
 
-from integration_test.common.device_hba_tests import HBADeviceTests
+from integration_tests.common.device_hba_tests import HBADeviceTests
 
 
 class TestHBADevice(HBADeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/base.py b/integration_tests/default/devices/base.py
similarity index 98%
rename from tangostationcontrol/integration_test/default/devices/base.py
rename to integration_tests/default/devices/base.py
index a9be4881fc0db0abcfa73d0205f76bd73a062e82..a1c7f6368b6f2fef60382ccd83c6010c601f340c 100644
--- a/tangostationcontrol/integration_test/default/devices/base.py
+++ b/integration_tests/default/devices/base.py
@@ -3,8 +3,8 @@
 
 from typing import Callable, Dict
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 from tango import DevState, AttrWriteType
 
diff --git a/tangostationcontrol/integration_test/default/devices/base_device_classes/__init__.py b/integration_tests/default/devices/base_device_classes/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/default/devices/base_device_classes/__init__.py
rename to integration_tests/default/devices/base_device_classes/__init__.py
diff --git a/tangostationcontrol/integration_test/default/devices/base_device_classes/test_power_hierarchy.py b/integration_tests/default/devices/base_device_classes/test_power_hierarchy.py
similarity index 92%
rename from tangostationcontrol/integration_test/default/devices/base_device_classes/test_power_hierarchy.py
rename to integration_tests/default/devices/base_device_classes/test_power_hierarchy.py
index 2794aab0f0489f541bd957f3770b0e9e5808e256..e9d771fd8b229ff7ff82da3cdac702d1425d817d 100644
--- a/tangostationcontrol/integration_test/default/devices/base_device_classes/test_power_hierarchy.py
+++ b/integration_tests/default/devices/base_device_classes/test_power_hierarchy.py
@@ -9,10 +9,10 @@ import logging
 import tangostationcontrol
 from tango import Database
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
-from integration_test.common.base_device_classes.power_hierarchy_tests import (
+from integration_tests.common.base_device_classes.power_hierarchy_tests import (
     DevicePowerHierarchyControlTests,
 )
 
diff --git a/tangostationcontrol/integration_test/default/devices/base_device_classes/test_proxy_timeout.py b/integration_tests/default/devices/base_device_classes/test_proxy_timeout.py
similarity index 93%
rename from tangostationcontrol/integration_test/default/devices/base_device_classes/test_proxy_timeout.py
rename to integration_tests/default/devices/base_device_classes/test_proxy_timeout.py
index 746dd2affca628255530273db5b8cf0bbcde1a12..a02b5c4c74c3774822b716029631c3292b897113 100644
--- a/tangostationcontrol/integration_test/default/devices/base_device_classes/test_proxy_timeout.py
+++ b/integration_tests/default/devices/base_device_classes/test_proxy_timeout.py
@@ -9,8 +9,8 @@ import logging
 from tango import Database
 
 import tangostationcontrol.devices
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 logger = logging.getLogger()
 
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_apsct.py b/integration_tests/default/devices/test_device_apsct.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_apsct.py
rename to integration_tests/default/devices/test_device_apsct.py
index 9f52edc436a82c97bd3c9d880ff77ee7ccced796..e7df150d1f9ed0ad718d53d3e3b73d2d2f3d0700 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_apsct.py
+++ b/integration_tests/default/devices/test_device_apsct.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceAPSCT(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_apspu.py b/integration_tests/default/devices/test_device_apspu.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_apspu.py
rename to integration_tests/default/devices/test_device_apspu.py
index b31e10afdd93c39405f9e3797dbe793b09855858..aa45b333742b44b48dff18a5d7fc430303fc06f5 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_apspu.py
+++ b/integration_tests/default/devices/test_device_apspu.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceAPSPU(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py b/integration_tests/default/devices/test_device_beamlet.py
similarity index 88%
rename from tangostationcontrol/integration_test/default/devices/test_device_beamlet.py
rename to integration_tests/default/devices/test_device_beamlet.py
index 013926e560a5eb414377c0f8c6c1ee1d8d5a33b5..89defd90887749cc5429d9a5781a92540b25a349 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py
+++ b/integration_tests/default/devices/test_device_beamlet.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_beamlet_tests import BeamletDeviceTests
+from integration_tests.common.device_beamlet_tests import BeamletDeviceTests
 
 
 class TestDeviceBeamletHBA0(BeamletDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_bst.py b/integration_tests/default/devices/test_device_bst.py
similarity index 89%
rename from tangostationcontrol/integration_test/default/devices/test_device_bst.py
rename to integration_tests/default/devices/test_device_bst.py
index 41bf977840974f1374114bb236d43a8af88192a1..1eeebec66c0ce9cbfa4579ee1c98cd3c3afb0c11 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_bst.py
+++ b/integration_tests/default/devices/test_device_bst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_bst_tests import BSTDeviceTests
+from integration_tests.common.device_bst_tests import BSTDeviceTests
 
 
 class TestDeviceBSTHBA0(BSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_calibration.py b/integration_tests/default/devices/test_device_calibration.py
similarity index 99%
rename from tangostationcontrol/integration_test/default/devices/test_device_calibration.py
rename to integration_tests/default/devices/test_device_calibration.py
index 264eb0afb30c036b1f9fb92d36f9bfccd4b7f354..7387c092052113be3d39efbdaf1c006e5d47d8ea 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_calibration.py
+++ b/integration_tests/default/devices/test_device_calibration.py
@@ -3,7 +3,7 @@
 
 import numpy
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 from tangostationcontrol.common.constants import (
     N_rcu,
     N_rcu_inp,
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_ccd.py b/integration_tests/default/devices/test_device_ccd.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_ccd.py
rename to integration_tests/default/devices/test_device_ccd.py
index f62e89f902d0af806dafa3b882e48ae7f93ac080..42b1e03955477cee53d171e516f04e6e7173f9dc 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_ccd.py
+++ b/integration_tests/default/devices/test_device_ccd.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceCCD(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py b/integration_tests/default/devices/test_device_digitalbeam.py
similarity index 92%
rename from tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py
rename to integration_tests/default/devices/test_device_digitalbeam.py
index 02568e6ffadc91022379cd899cfee580e49aad2c..42ac33e9cd852f236db0505b6b99bdd59e7125bf 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py
+++ b/integration_tests/default/devices/test_device_digitalbeam.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import CS001_TILES
 
-from integration_test.common.device_digitalbeam_tests import DigitalBeamDeviceTests
+from integration_tests.common.device_digitalbeam_tests import DigitalBeamDeviceTests
 
 
 class TestDeviceDigitalBeamHBA0(DigitalBeamDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_ec.py b/integration_tests/default/devices/test_device_ec.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_ec.py
rename to integration_tests/default/devices/test_device_ec.py
index 60cb488d39168539c01301c874cbbc3bdf5b4897..28c4fb3f34f39e888faf537d54938c1ea7510ff8 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_ec.py
+++ b/integration_tests/default/devices/test_device_ec.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDevicePCON(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_metadata.py b/integration_tests/default/devices/test_device_metadata.py
similarity index 86%
rename from tangostationcontrol/integration_test/default/devices/test_device_metadata.py
rename to integration_tests/default/devices/test_device_metadata.py
index e1716ba39c22e673ab67e1e10665ec7855b6085c..9545de6767a8daa1df8e8ea428e7a21b1bc645f0 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_metadata.py
+++ b/integration_tests/default/devices/test_device_metadata.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 logger = logging.getLogger()
 
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_observation_control.py b/integration_tests/default/devices/test_device_observation_control.py
similarity index 93%
rename from tangostationcontrol/integration_test/default/devices/test_device_observation_control.py
rename to integration_tests/default/devices/test_device_observation_control.py
index e46c0743f69bb8959e0fd47fc45c93a39a8bdb7d..0b757ca10590b9c00d7def792d37be82370250b8 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_observation_control.py
+++ b/integration_tests/default/devices/test_device_observation_control.py
@@ -6,7 +6,7 @@ from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_hba_core_immediate,
 )
 
-from integration_test.common.device_observation_control_tests import (
+from integration_tests.common.device_observation_control_tests import (
     DeviceObservationControlTests,
 )
 
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_observation_field.py b/integration_tests/default/devices/test_device_observation_field.py
similarity index 99%
rename from tangostationcontrol/integration_test/default/devices/test_device_observation_field.py
rename to integration_tests/default/devices/test_device_observation_field.py
index 1b0e786533cd17fea0d69e284217c6c12c0d0bad..69578eb8d55c1c98b0b6d893d45fa196c13485b9 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_observation_field.py
+++ b/integration_tests/default/devices/test_device_observation_field.py
@@ -7,8 +7,8 @@ from json import loads
 
 import numpy
 
-from integration_test.device_proxy import TestDeviceProxy
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.device_proxy import TestDeviceProxy
+from integration_tests.default.devices.base import TestDeviceBase
 
 from tango import DevState
 from tango import DevFailed
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_pcon.py b/integration_tests/default/devices/test_device_pcon.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_pcon.py
rename to integration_tests/default/devices/test_device_pcon.py
index 46c1e8311ff5610f601c5ec5d9da0845e3330a42..1b4d3a10585e9e0fafa6a09696bbf8fda00e0c88 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_pcon.py
+++ b/integration_tests/default/devices/test_device_pcon.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDevicePCON(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_protection_control.py b/integration_tests/default/devices/test_device_protection_control.py
similarity index 98%
rename from tangostationcontrol/integration_test/default/devices/test_device_protection_control.py
rename to integration_tests/default/devices/test_device_protection_control.py
index 599d21786bddfac110a5d7221031d581bbaef231..e4e8329685d036122f69cbed881aa6a701985c2b 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_protection_control.py
+++ b/integration_tests/default/devices/test_device_protection_control.py
@@ -10,7 +10,7 @@ from tango import Database, DevState
 
 from tangostationcontrol.devices import UNB2, SDPFirmware, RECVL, RECVH, APSCT, APSPU
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 logger = logging.getLogger()
 
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_recvh.py b/integration_tests/default/devices/test_device_recvh.py
similarity index 94%
rename from tangostationcontrol/integration_test/default/devices/test_device_recvh.py
rename to integration_tests/default/devices/test_device_recvh.py
index b961fd3ab4fc7865e80b8578d78f249584ec2afe..a6423c1be194d1e54c4c583fe15d87499e8e4dc0 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_recvh.py
+++ b/integration_tests/default/devices/test_device_recvh.py
@@ -5,7 +5,7 @@ import time
 
 import numpy
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceRECV(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_recvl.py b/integration_tests/default/devices/test_device_recvl.py
similarity index 77%
rename from tangostationcontrol/integration_test/default/devices/test_device_recvl.py
rename to integration_tests/default/devices/test_device_recvl.py
index b049639151309934659ff3b1f6b64776255e3890..183fdb6a4909f98072ad569bced8347f34a2018e 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_recvl.py
+++ b/integration_tests/default/devices/test_device_recvl.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceRECV(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_sdp.py b/integration_tests/default/devices/test_device_sdp.py
similarity index 90%
rename from tangostationcontrol/integration_test/default/devices/test_device_sdp.py
rename to integration_tests/default/devices/test_device_sdp.py
index 633d3f1bdda2bb08b7b0759632016858e8fe355a..4541aab33d6d69c7337bd1a9dae271c9837f1f5f 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_sdp.py
+++ b/integration_tests/default/devices/test_device_sdp.py
@@ -1,7 +1,7 @@
 #  Copyright (C)  2024 ASTRON (Netherlands Institute for Radio Astronomy)
 #  SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sdp_tests import SDPDeviceTests
+from integration_tests.common.device_sdp_tests import SDPDeviceTests
 
 
 class TestSDPDeviceHBA0(SDPDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_sdpfirmware.py b/integration_tests/default/devices/test_device_sdpfirmware.py
similarity index 87%
rename from tangostationcontrol/integration_test/default/devices/test_device_sdpfirmware.py
rename to integration_tests/default/devices/test_device_sdpfirmware.py
index 0c10055e6a2ba3efe934ede0b67b4b1d0ef65612..7bbbb1dc171c2efc2bdb90f69c631b4f72fbbe73 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_sdpfirmware.py
+++ b/integration_tests/default/devices/test_device_sdpfirmware.py
@@ -1,7 +1,7 @@
 #  Copyright (C)  2024 ASTRON (Netherlands Institute for Radio Astronomy)
 #  SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sdpfirmware_tests import SDPFirmwareDeviceTests
+from integration_tests.common.device_sdpfirmware_tests import SDPFirmwareDeviceTests
 
 
 class TestSDPFirmwareDeviceHBA0(SDPFirmwareDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_sst.py b/integration_tests/default/devices/test_device_sst.py
similarity index 89%
rename from tangostationcontrol/integration_test/default/devices/test_device_sst.py
rename to integration_tests/default/devices/test_device_sst.py
index 421cbb8bc0eaa7b45a7757489ea2b9311632b547..fe18cc86f2cabbb99c1673fac027bc8313efc7d5 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_sst.py
+++ b/integration_tests/default/devices/test_device_sst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sst_tests import SSTDeviceTests
+from integration_tests.common.device_sst_tests import SSTDeviceTests
 
 
 class TestDeviceSSTHBA0(SSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_station_manager.py b/integration_tests/default/devices/test_device_station_manager.py
similarity index 82%
rename from tangostationcontrol/integration_test/default/devices/test_device_station_manager.py
rename to integration_tests/default/devices/test_device_station_manager.py
index 970454e2161cfbbd44d3ec2ccb58febf9755c98b..88afb99ee2a20c84ed295742c6dacc95dbcb6e9a 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_station_manager.py
+++ b/integration_tests/default/devices/test_device_station_manager.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceStationManager(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_tilebeam.py b/integration_tests/default/devices/test_device_tilebeam.py
similarity index 92%
rename from tangostationcontrol/integration_test/default/devices/test_device_tilebeam.py
rename to integration_tests/default/devices/test_device_tilebeam.py
index c07aceb9f2e9a6c45b0b385e6f4ec1cbd935c2be..a4a4f4d9985b7aa10439c95dab72c611ac8177df 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_tilebeam.py
+++ b/integration_tests/default/devices/test_device_tilebeam.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import CS001_TILES
 
-from integration_test.common.device_tilebeam_tests import TileBeamDeviceTests
+from integration_tests.common.device_tilebeam_tests import TileBeamDeviceTests
 
 
 class TestDeviceTilebeamHBA0(TileBeamDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_unb2.py b/integration_tests/default/devices/test_device_unb2.py
similarity index 82%
rename from tangostationcontrol/integration_test/default/devices/test_device_unb2.py
rename to integration_tests/default/devices/test_device_unb2.py
index 8d2860f992c5aecf8752bcf0b9085b511d5a9a93..f94e25123291b711e6d5e0926d8cbb28b0cf3af0 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_unb2.py
+++ b/integration_tests/default/devices/test_device_unb2.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.default.devices.base import TestDeviceBase
+from integration_tests.default.devices.base import TestDeviceBase
 
 
 class TestDeviceUNB2H0(TestDeviceBase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_device_xst.py b/integration_tests/default/devices/test_device_xst.py
similarity index 88%
rename from tangostationcontrol/integration_test/default/devices/test_device_xst.py
rename to integration_tests/default/devices/test_device_xst.py
index 4bd88c53acfd9c06444dba9204ca875769969a8c..0562d56de4c919aa1f1913304b69bea3e4b67292 100644
--- a/tangostationcontrol/integration_test/default/devices/test_device_xst.py
+++ b/integration_tests/default/devices/test_device_xst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_xst_tests import XSTDeviceTests
+from integration_tests.common.device_xst_tests import XSTDeviceTests
 
 
 class TestDeviceXSTHBA0(XSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/default/devices/test_lofar_device.py b/integration_tests/default/devices/test_lofar_device.py
similarity index 96%
rename from tangostationcontrol/integration_test/default/devices/test_lofar_device.py
rename to integration_tests/default/devices/test_lofar_device.py
index 2852aa73071adb26aab332a37d05da29b034d080..c791f0b6e5b0b20509d8db46918ae5bb833b259e 100644
--- a/tangostationcontrol/integration_test/default/devices/test_lofar_device.py
+++ b/integration_tests/default/devices/test_lofar_device.py
@@ -7,8 +7,8 @@ from tango import DevState
 
 from tangostationcontrol.common.constants import DEFAULT_POLLING_PERIOD_MS
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 
 class TestProxyAttributeAccess(base.IntegrationTestCase):
diff --git a/tangostationcontrol/integration_test/default/devices/test_observation_client.py b/integration_tests/default/devices/test_observation_client.py
similarity index 97%
rename from tangostationcontrol/integration_test/default/devices/test_observation_client.py
rename to integration_tests/default/devices/test_observation_client.py
index e21c38cc21e9b55b8853bcfdc066c1807325b261..00b584a8dda9c7c0bbe5fd047c03a680393cd880 100644
--- a/tangostationcontrol/integration_test/default/devices/test_observation_client.py
+++ b/integration_tests/default/devices/test_observation_client.py
@@ -4,8 +4,8 @@
 from json import loads
 from os import environ
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_hba_core_immediate,
 )
diff --git a/tangostationcontrol/integration_test/default/devices/test_tango_database.py b/integration_tests/default/devices/test_tango_database.py
similarity index 95%
rename from tangostationcontrol/integration_test/default/devices/test_tango_database.py
rename to integration_tests/default/devices/test_tango_database.py
index cbc8b041310c136dd967304e0e8e21cee5f84b5b..9eda676ef60f8bb71b40574f9d8ee77b9473c220 100644
--- a/tangostationcontrol/integration_test/default/devices/test_tango_database.py
+++ b/integration_tests/default/devices/test_tango_database.py
@@ -3,7 +3,7 @@
 
 from tango import Database
 
-from integration_test import base
+from integration_tests import base
 
 
 class TestTangoDatabase(base.IntegrationTestCase):
diff --git a/tangostationcontrol/integration_test/device_proxy.py b/integration_tests/device_proxy.py
similarity index 100%
rename from tangostationcontrol/integration_test/device_proxy.py
rename to integration_tests/device_proxy.py
diff --git a/tangostationcontrol/integration_test/digitalbeam_performance/__init__.py b/integration_tests/digitalbeam_performance/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/digitalbeam_performance/__init__.py
rename to integration_tests/digitalbeam_performance/__init__.py
diff --git a/tangostationcontrol/integration_test/digitalbeam_performance/test_digitalbeam_performance.py b/integration_tests/digitalbeam_performance/test_digitalbeam_performance.py
similarity index 98%
rename from tangostationcontrol/integration_test/digitalbeam_performance/test_digitalbeam_performance.py
rename to integration_tests/digitalbeam_performance/test_digitalbeam_performance.py
index 4d40091c2c143bd4beac3cf3e571783a06365ae1..ea8059b70a9fba0085759ec38e6ab64f547d8a93 100644
--- a/tangostationcontrol/integration_test/digitalbeam_performance/test_digitalbeam_performance.py
+++ b/integration_tests/digitalbeam_performance/test_digitalbeam_performance.py
@@ -6,8 +6,8 @@ import statistics
 import time
 import numpy
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 from tango import DevState
 
diff --git a/tangostationcontrol/integration_test/remote_station/__init__.py b/integration_tests/remote_station/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/remote_station/__init__.py
rename to integration_tests/remote_station/__init__.py
diff --git a/tangostationcontrol/integration_test/remote_station/antennafield/__init__.py b/integration_tests/remote_station/antennafield/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/remote_station/antennafield/__init__.py
rename to integration_tests/remote_station/antennafield/__init__.py
diff --git a/tangostationcontrol/integration_test/remote_station/antennafield/test_device_hba.py b/integration_tests/remote_station/antennafield/test_device_hba.py
similarity index 87%
rename from tangostationcontrol/integration_test/remote_station/antennafield/test_device_hba.py
rename to integration_tests/remote_station/antennafield/test_device_hba.py
index ea842bf026989475c285af36eb8091211d4fd0c1..5206e15cb720e9d9e20f251874596c65161bf772 100644
--- a/tangostationcontrol/integration_test/remote_station/antennafield/test_device_hba.py
+++ b/integration_tests/remote_station/antennafield/test_device_hba.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import RS307_TILES
 
-from integration_test.common.device_hba_tests import HBADeviceTests
+from integration_tests.common.device_hba_tests import HBADeviceTests
 
 
 class TestHBADevice(HBADeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/base_device_classes/__init__.py b/integration_tests/remote_station/base_device_classes/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/remote_station/base_device_classes/__init__.py
rename to integration_tests/remote_station/base_device_classes/__init__.py
diff --git a/tangostationcontrol/integration_test/remote_station/base_device_classes/test_power_hierarchy.py b/integration_tests/remote_station/base_device_classes/test_power_hierarchy.py
similarity index 86%
rename from tangostationcontrol/integration_test/remote_station/base_device_classes/test_power_hierarchy.py
rename to integration_tests/remote_station/base_device_classes/test_power_hierarchy.py
index efe116924ef5a972fa4e114f15791b2325ad4ac1..41249432ceae3e6e3ee0a36295ffca41ff07bd44 100644
--- a/tangostationcontrol/integration_test/remote_station/base_device_classes/test_power_hierarchy.py
+++ b/integration_tests/remote_station/base_device_classes/test_power_hierarchy.py
@@ -5,7 +5,7 @@
 
 import logging
 
-from integration_test.common.base_device_classes.power_hierarchy_tests import (
+from integration_tests.common.base_device_classes.power_hierarchy_tests import (
     DevicePowerHierarchyControlTests,
 )
 
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_beamlet.py b/integration_tests/remote_station/test_device_beamlet.py
similarity index 78%
rename from tangostationcontrol/integration_test/remote_station/test_device_beamlet.py
rename to integration_tests/remote_station/test_device_beamlet.py
index d2a550d59de989c4ebea32e2a590b73e970781bd..41dae6934aa6fb1c5297a1c3628f7382849b9f58 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_beamlet.py
+++ b/integration_tests/remote_station/test_device_beamlet.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_beamlet_tests import BeamletDeviceTests
+from integration_tests.common.device_beamlet_tests import BeamletDeviceTests
 
 
 class TestDeviceBeamletHBA(BeamletDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_bst.py b/integration_tests/remote_station/test_device_bst.py
similarity index 83%
rename from tangostationcontrol/integration_test/remote_station/test_device_bst.py
rename to integration_tests/remote_station/test_device_bst.py
index 4d7515cdee17e9927ee1153065ecccd6f5ff00c5..5466d064fccf6dd77ab405dbac201e614751af0c 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_bst.py
+++ b/integration_tests/remote_station/test_device_bst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_bst_tests import BSTDeviceTests
+from integration_tests.common.device_bst_tests import BSTDeviceTests
 
 
 class TestDeviceBSTHBA(BSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_digitalbeam.py b/integration_tests/remote_station/test_device_digitalbeam.py
similarity index 87%
rename from tangostationcontrol/integration_test/remote_station/test_device_digitalbeam.py
rename to integration_tests/remote_station/test_device_digitalbeam.py
index 7a170b2bf7ff092e005957dba82535679362b44e..4f58d8955673735122a65df1ddca73aab66759b3 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_digitalbeam.py
+++ b/integration_tests/remote_station/test_device_digitalbeam.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import RS307_TILES
 
-from integration_test.common.device_digitalbeam_tests import DigitalBeamDeviceTests
+from integration_tests.common.device_digitalbeam_tests import DigitalBeamDeviceTests
 
 
 class TestDeviceDigitalBeamHBA(DigitalBeamDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_observation_control.py b/integration_tests/remote_station/test_device_observation_control.py
similarity index 93%
rename from tangostationcontrol/integration_test/remote_station/test_device_observation_control.py
rename to integration_tests/remote_station/test_device_observation_control.py
index bed51697cab84ed6a8537bc24c068700c735c344..87fb0007b010e882017262f26f5fa6f5dad343ee 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_observation_control.py
+++ b/integration_tests/remote_station/test_device_observation_control.py
@@ -6,7 +6,7 @@ from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_hba_core_immediate,
 )
 
-from integration_test.common.device_observation_control_tests import (
+from integration_tests.common.device_observation_control_tests import (
     DeviceObservationControlTests,
 )
 
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_sdp.py b/integration_tests/remote_station/test_device_sdp.py
similarity index 84%
rename from tangostationcontrol/integration_test/remote_station/test_device_sdp.py
rename to integration_tests/remote_station/test_device_sdp.py
index 657904c1a42b961fac56cc645ca1a843960e131f..d30561ff6ee470f5b77a2394559cc49a9b27b502 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_sdp.py
+++ b/integration_tests/remote_station/test_device_sdp.py
@@ -1,7 +1,7 @@
 #  Copyright (C)  2024 ASTRON (Netherlands Institute for Radio Astronomy)
 #  SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sdp_tests import SDPDeviceTests
+from integration_tests.common.device_sdp_tests import SDPDeviceTests
 
 
 class TestSDPDeviceHBA(SDPDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_sdpfirmware.py b/integration_tests/remote_station/test_device_sdpfirmware.py
similarity index 80%
rename from tangostationcontrol/integration_test/remote_station/test_device_sdpfirmware.py
rename to integration_tests/remote_station/test_device_sdpfirmware.py
index 788ad90e8b56d2a73150cd78a1584182afe8d038..6fd59102c8cc6747255d040f3bb857a6fa9c3d57 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_sdpfirmware.py
+++ b/integration_tests/remote_station/test_device_sdpfirmware.py
@@ -1,7 +1,7 @@
 #  Copyright (C)  2024 ASTRON (Netherlands Institute for Radio Astronomy)
 #  SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sdpfirmware_tests import SDPFirmwareDeviceTests
+from integration_tests.common.device_sdpfirmware_tests import SDPFirmwareDeviceTests
 
 
 class TestSDPFirmwareDeviceHBA(SDPFirmwareDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_sst.py b/integration_tests/remote_station/test_device_sst.py
similarity index 82%
rename from tangostationcontrol/integration_test/remote_station/test_device_sst.py
rename to integration_tests/remote_station/test_device_sst.py
index 44661fa7b83dafba3818ff6e8a69afc40eb8e317..12fb74993b02d2946c75b95b440cde355d0888b2 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_sst.py
+++ b/integration_tests/remote_station/test_device_sst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_sst_tests import SSTDeviceTests
+from integration_tests.common.device_sst_tests import SSTDeviceTests
 
 
 class TestDeviceBSTHBA(SSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_tilebeam.py b/integration_tests/remote_station/test_device_tilebeam.py
similarity index 91%
rename from tangostationcontrol/integration_test/remote_station/test_device_tilebeam.py
rename to integration_tests/remote_station/test_device_tilebeam.py
index c8c783daf5fc3604727fec427e82fcd95ca1a41b..31666797f2a5f5019ee75b9a9fd3a54797aed1c9 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_tilebeam.py
+++ b/integration_tests/remote_station/test_device_tilebeam.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common.constants import RS307_TILES
 
-from integration_test.common.device_tilebeam_tests import TileBeamDeviceTests
+from integration_tests.common.device_tilebeam_tests import TileBeamDeviceTests
 
 
 class TestDeviceTilebeamHBA(TileBeamDeviceTests):
diff --git a/tangostationcontrol/integration_test/remote_station/test_device_xst.py b/integration_tests/remote_station/test_device_xst.py
similarity index 82%
rename from tangostationcontrol/integration_test/remote_station/test_device_xst.py
rename to integration_tests/remote_station/test_device_xst.py
index 43c486febc387373f0e9a4d6dd838a71548e8d6a..dc02d08ae1a97e3fc213c11cb32c8797a9ac6f3e 100644
--- a/tangostationcontrol/integration_test/remote_station/test_device_xst.py
+++ b/integration_tests/remote_station/test_device_xst.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from integration_test.common.device_xst_tests import XSTDeviceTests
+from integration_tests.common.device_xst_tests import XSTDeviceTests
 
 
 class TestDeviceXSTHBA(XSTDeviceTests):
diff --git a/tangostationcontrol/integration_test/reset_fixture.py b/integration_tests/reset_fixture.py
similarity index 94%
rename from tangostationcontrol/integration_test/reset_fixture.py
rename to integration_tests/reset_fixture.py
index a36ac0f5623f198bff36e4dd2512ea7612d0a448..6f512a3463e49aea0d3acb3154a3c48468c15160 100644
--- a/tangostationcontrol/integration_test/reset_fixture.py
+++ b/integration_tests/reset_fixture.py
@@ -5,7 +5,7 @@ import re
 
 from tango import Database
 
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests.device_proxy import TestDeviceProxy
 
 DEFAULT_SKIP_SERVER_NAMES = [
     "configuration/stat",
diff --git a/tangostationcontrol/integration_test/tilebeam_performance/__init__.py b/integration_tests/tilebeam_performance/__init__.py
similarity index 100%
rename from tangostationcontrol/integration_test/tilebeam_performance/__init__.py
rename to integration_tests/tilebeam_performance/__init__.py
diff --git a/tangostationcontrol/integration_test/tilebeam_performance/test_tilebeam_performance.py b/integration_tests/tilebeam_performance/test_tilebeam_performance.py
similarity index 98%
rename from tangostationcontrol/integration_test/tilebeam_performance/test_tilebeam_performance.py
rename to integration_tests/tilebeam_performance/test_tilebeam_performance.py
index aa1559766a9d8123b9772cfaa79e7b74bdb7ec4f..406e632eb8236706e77eea0de0951c52b506707c 100644
--- a/tangostationcontrol/integration_test/tilebeam_performance/test_tilebeam_performance.py
+++ b/integration_tests/tilebeam_performance/test_tilebeam_performance.py
@@ -6,8 +6,8 @@ import statistics
 import time
 import numpy
 
-from integration_test import base
-from integration_test.device_proxy import TestDeviceProxy
+from integration_tests import base
+from integration_tests.device_proxy import TestDeviceProxy
 
 from tango import DevState
 from tangostationcontrol.devices.base_device_classes.antennafield_device import (
diff --git a/jupyter-notebooks/Beamforming_Test.ipynb b/jupyter-notebooks/Beamforming_Test.ipynb
index 323982e348f818f54349f6f7b526adc6a793730a..f072f3a95926e225cc3de2ca49b9821aaa92b150 100644
--- a/jupyter-notebooks/Beamforming_Test.ipynb
+++ b/jupyter-notebooks/Beamforming_Test.ipynb
@@ -9,7 +9,7 @@
    "source": [
     "import time, sys, datetime\n",
     "import numpy\n",
-    "sys.path.append('/hosthome/tango/tangostationcontrol/tangostationcontrol')\n",
+    "sys.path.append('/hosthome/tango/tangostationcontrol')\n",
     "from beam.delays import delay_calculator"
    ]
   },
@@ -30,7 +30,7 @@
    "source": [
     "# RECV device\n",
     "device_name = 'STAT/RECV/1'\n",
-    "d=DeviceProxy(device_name) \n",
+    "d=DeviceProxy(device_name)\n",
     "state = str(d.state())\n",
     "print(device_name + ' : ' + state)"
    ]
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000000000000000000000000000000000..5ee79070141b3421b1bbe0746a23256a2e0d8f77
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,114 @@
+[build-system]
+requires = [
+    "setuptools>=70.0",
+    "setuptools_scm[toml]>=8.0",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+version_file = "tangostationcontrol/_version.py"
+
+[tool.coverage.run]
+branch = true
+source = ["tangostationcontrol"]
+
+[tool.coverage.report]
+ignore_errors = true
+
+[tool.ruff]
+exclude = [
+    ".venv",
+    ".git",
+    ".tox",
+    "dist",
+    "docs",
+    "*lib/python*",
+    "*egg",
+    "_version.py"
+]
+
+[tool.ruff.lint]
+ignore = ["E203"]
+
+[tool.pytest.ini_options]
+addopts = "--forked"
+markers = [
+    "timeout",
+]
+
+[tool.tox]
+# Generative environment list to test all supported Python versions
+requires = ["tox>=4.21"]
+env_list = ["fix", "coverage", "lint", "format", "py{11, 10}"]
+
+[tool.tox.env_run_base]
+package = "editable"
+deps = [
+    "-r{toxinidir}/requirements.txt",
+    "-r{toxinidir}/tests/requirements.txt"]
+set_env = { LANGUAGE = "en_US", LC_ALL = "en_US.UTF-8", PYTHONWARNINGS = "default::DeprecationWarning" }
+commands = [["python", "--version"], ["python", "-m", "pytest", "tests/{posargs}"]]
+
+[tool.tox.env.fix]
+description = "format the code base to adhere to our styles, and complain about what we cannot do automatically"
+skip_install = true
+deps = ["pre-commit-uv>=4.1.1"]
+commands = [["pre-commit", "run", "--all-files", "--show-diff-on-failure"]]
+
+[tool.tox.env.coverage]
+commands = [
+    ["python", "--version"],
+    ["python", "-m", "coverage",  "--version"],
+    ["python", "-m", "coverage",  "erase"],
+    ["python",  "-m", "coverage", "run", "-m", "pytest", "-v", "tests/{posargs}"],
+    ["python", "-m", "pytest", "-v", "--log-level=DEBUG", "--cov-report", "term", "--cov-report", "html", "--cov-append", "--cov-report", "xml:coverage.xml", "--cov=tangostationcontrol", "tests/{posargs}"]
+]
+
+[tool.tox.env.integration]
+allowlist_externals = [
+    "{work_dir}/.tox/bin/python",
+    "echo"
+]
+pass_env = ["TANGO_HOST", "DEBUG_HOST"]
+set_env = { VIRTUAL_ENV= "{envdir}", TESTS_DIR = "./integration_tests/{env:TEST_MODULE:default}", PIP_EXTRA_INDEX_URL = "https://git.astron.nl/api/v4/groups/36/-/packages/pypi/simple"}
+commands = [
+    ["python", "--version"],
+    ["echo", "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE:default})"],
+    ["python", "-m", "pytest", "-v", "--log-level=DEBUG", "--cov-report", "term", "--cov-report", "xml", "--cov-report", "html", "--cov-append", "--cov=tangostationcontrol", "--forked", "{env:TESTS_DIR}/{posargs}"]
+]
+
+# Command prefixes to reuse the same virtualenv for all linting jobs.
+[tool.tox.env.lint]
+deps = [
+    "ruff",
+    "-r{toxinidir}/tests/requirements.txt"]
+commands = [
+    ["python", "-m", "ruff", "--version"],
+    ["python", "-m", "ruff", "check", { replace = "posargs", default = ["tangostationcontrol", "tests", "integration_tests"], extend = true }]
+]
+
+[tool.tox.env.format]
+deps = [
+    "ruff",
+    "-r{toxinidir}/tests/requirements.txt"]
+commands = [
+    ["python", "-m", "ruff", "format", "-v", { replace = "posargs", default = ["tangostationcontrol", "tests", "integration_tests"], extend = true }]
+]
+
+[tool.tox.env.docs]
+deps = [
+    "-r{toxinidir}/requirements.txt",
+    "-r{toxinidir}/docs/requirements.txt"]
+# unset LC_ALL / LANGUAGE from testenv, would fail sphinx otherwise
+set_env = ""
+changedir = "{tox_root}"
+commands = [
+    ["python", "docs/cleanup.py"],
+    ["sphinx-build", "-b", "html", "docs/source", "docs/build/html"]
+]
+
+[tool.tox.env.build]
+package = "wheel"
+deps = ["build>=0.8.0"]
+commands = [["python", "-m", "build"]]
diff --git a/tangostationcontrol/requirements.txt b/requirements.txt
similarity index 100%
rename from tangostationcontrol/requirements.txt
rename to requirements.txt
diff --git a/tangostationcontrol/setup.cfg b/setup.cfg
similarity index 67%
rename from tangostationcontrol/setup.cfg
rename to setup.cfg
index d39caee988faf86fb807d1e01ddd102f926f5fbe..fb1f8d4fca0b1bea0297f2e59304aab2b144853a 100644
--- a/tangostationcontrol/setup.cfg
+++ b/setup.cfg
@@ -1,17 +1,11 @@
 [metadata]
 name = tangostationcontrol
-version = file: VERSION
-summary = LOFAR 2.0 Station Control
-description_file =
-    README.md
-description_content_type = text/x-rst; charset=UTF-8
-author = ASTRON
-home_page = https://astron.nl
-project_urls =
-    Bug Tracker = https://support.astron.nl/jira/projects/L2SS/issues/
-    Source Code = https://git.astron.nl/lofar2.0/tango
-license = Apache-2
-classifier =
+description = LOFAR 2.0 Station Control
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://git.astron.nl/lofar2.0/tango/
+license = Apache License 2.0
+classifiers =
     Environment :: Console
     Development Status :: 3 - Alpha
     License :: Apache Software License
@@ -23,15 +17,9 @@ classifier =
 [options]
 include_package_data = true
 packages = find:
-python_requires = >3.10
+python_requires = >=3.10
 install_requires = file: requirements.txt
 
-[options.extras_require]
-debug = file: debug-requirements.txt
-
-[options.packages.find]
-where = .
-
 [options.entry_points]
 console_scripts =
     l2ss-ds = tangostationcontrol.device_server:main
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..10fdaec810e96f0f1cbedb4a5ddf532c03f50dc4
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,7 @@
+#  Copyright (C) 2023 ASTRON (Netherlands Institute for Radio Astronomy)
+#  SPDX-License-Identifier: Apache-2.0
+
+""" Setuptools entry point  """
+import setuptools
+
+setuptools.setup()
diff --git a/setup.sh b/setup.sh
index 9b78cf467bc8e8d1d65df8930da9150158b4f93d..a829aec36cf2cad10cd3501094d443b9857f1958 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,7 +22,8 @@ fi
 
 # Activate the virtual environment
 source "$VENV_DIR/bin/activate"
-pip install pre-commit
+python -m pip install pre-commit
+python -m pip install "tox>=4.21.0"
 
 # Install git hooks
 if [ ! -f "${LOFAR20_DIR}/.git/hooks/post-checkout" ]; then
diff --git a/tangostationcontrol/.coveragerc b/tangostationcontrol/.coveragerc
deleted file mode 100644
index b2486a872aa8b866bba57b32df09eef1a5944d6e..0000000000000000000000000000000000000000
--- a/tangostationcontrol/.coveragerc
+++ /dev/null
@@ -1,6 +0,0 @@
-[run]
-branch = True
-source = tangostationcontrol
-
-[report]
-ignore_errors = True
diff --git a/tangostationcontrol/MANIFEST.in b/tangostationcontrol/MANIFEST.in
deleted file mode 100644
index c92b1492abbd60d528f21ae82ca818c4db092721..0000000000000000000000000000000000000000
--- a/tangostationcontrol/MANIFEST.in
+++ /dev/null
@@ -1,7 +0,0 @@
-include LICENSE.txt
-include README.md
-include tangostatiocontrol/VERSION
-
-include tangostationcontrol/configuration/schemas/*.json
-recursive-exclude tangostationcontrol/test *
-recursive-exclude tangostationcontrol/integration_test *
diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION
deleted file mode 100644
index 421ab545d9adc503fddf2ea2ce447a9a8c5323af..0000000000000000000000000000000000000000
--- a/tangostationcontrol/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.47.0
diff --git a/tangostationcontrol/tangostationcontrol/__init__.py b/tangostationcontrol/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/__init__.py
rename to tangostationcontrol/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/asyncio/__init__.py b/tangostationcontrol/asyncio/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/asyncio/__init__.py
rename to tangostationcontrol/asyncio/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/asyncio/_event_loop_thread.py b/tangostationcontrol/asyncio/_event_loop_thread.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/asyncio/_event_loop_thread.py
rename to tangostationcontrol/asyncio/_event_loop_thread.py
diff --git a/tangostationcontrol/tangostationcontrol/asyncio/_monitored_lock.py b/tangostationcontrol/asyncio/_monitored_lock.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/asyncio/_monitored_lock.py
rename to tangostationcontrol/asyncio/_monitored_lock.py
diff --git a/tangostationcontrol/tangostationcontrol/asyncio/_periodic_task.py b/tangostationcontrol/asyncio/_periodic_task.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/asyncio/_periodic_task.py
rename to tangostationcontrol/asyncio/_periodic_task.py
index 89b20a42cce026303dcf88a7e5193177c7cd3997..23fe70cc5f151eb2796a4f301e6476cf19fe2b17 100644
--- a/tangostationcontrol/tangostationcontrol/asyncio/_periodic_task.py
+++ b/tangostationcontrol/asyncio/_periodic_task.py
@@ -44,7 +44,7 @@ class PeriodicTask:
                 await self.func()
             except (CancelledError, asyncio.CancelledError):
                 raise
-            except Exception as ex:
+            except Exception:
                 logger.exception(f"Periodic task for {self.func} raised an exception")
 
             # TODO(JDM): Calculate how long to sleep to have the runtime of
diff --git a/tangostationcontrol/tangostationcontrol/beam/__init__.py b/tangostationcontrol/beam/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/__init__.py
rename to tangostationcontrol/beam/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/beam/delays.py b/tangostationcontrol/beam/delays.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/beam/delays.py
rename to tangostationcontrol/beam/delays.py
index b944141edc39761caf730fbe40237b736eb5fb03..f69257fce8cc05083231e886002e16777d5e5eba 100644
--- a/tangostationcontrol/tangostationcontrol/beam/delays.py
+++ b/tangostationcontrol/beam/delays.py
@@ -110,7 +110,7 @@ def is_valid_pointing(pointing: tuple[str, str, str]) -> bool:
         _ = measure.direction(*pointing)
 
         return True
-    except (RuntimeError, TypeError, KeyError, IndexError) as e:
+    except (RuntimeError, TypeError, KeyError, IndexError):
         return False
 
 
diff --git a/tangostationcontrol/tangostationcontrol/beam/geo.py b/tangostationcontrol/beam/geo.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/beam/geo.py
rename to tangostationcontrol/beam/geo.py
index 7aa24a8c0c3e0f46df55635b40e816f0d83bc1f3..0285bde9d44683c8dc9e1342dbbea5dc1009600c 100644
--- a/tangostationcontrol/tangostationcontrol/beam/geo.py
+++ b/tangostationcontrol/beam/geo.py
@@ -12,7 +12,7 @@ import numpy
    LOFAR station positions are measured in ETRS89,
    which are the coordinates of the position as it would be in 1989.
 
-   These coordinates are carthesian (X, Y, Z), 
+   These coordinates are carthesian (X, Y, Z),
    with (0, 0, 0) being the center of the Earth.
 
    The ETRS89 positions differ from the current due to tectonic movements.
diff --git a/tangostationcontrol/tangostationcontrol/beam/hba_tile.py b/tangostationcontrol/beam/hba_tile.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/hba_tile.py
rename to tangostationcontrol/beam/hba_tile.py
diff --git a/tangostationcontrol/tangostationcontrol/beam/managers/__init__.py b/tangostationcontrol/beam/managers/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/managers/__init__.py
rename to tangostationcontrol/beam/managers/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/beam/managers/_base.py b/tangostationcontrol/beam/managers/_base.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/managers/_base.py
rename to tangostationcontrol/beam/managers/_base.py
diff --git a/tangostationcontrol/tangostationcontrol/beam/managers/_digitalbeam.py b/tangostationcontrol/beam/managers/_digitalbeam.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/managers/_digitalbeam.py
rename to tangostationcontrol/beam/managers/_digitalbeam.py
diff --git a/tangostationcontrol/tangostationcontrol/beam/managers/_tilebeam.py b/tangostationcontrol/beam/managers/_tilebeam.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/beam/managers/_tilebeam.py
rename to tangostationcontrol/beam/managers/_tilebeam.py
diff --git a/tangostationcontrol/tangostationcontrol/clients/README.md b/tangostationcontrol/clients/README.md
similarity index 90%
rename from tangostationcontrol/tangostationcontrol/clients/README.md
rename to tangostationcontrol/clients/README.md
index 6136ef88b02e82335784de8c565dcd7ea1ae2744..c84b58f0b329519048409869b1be13546990af11 100644
--- a/tangostationcontrol/tangostationcontrol/clients/README.md
+++ b/tangostationcontrol/clients/README.md
@@ -2,9 +2,9 @@
 
 The attribute wrapper is an abstraction layer around tango attributes. This abstraction layer provides an easier and more consistent way of creating and using attributes and allows for easy reuse of code.
 
-You can find example uses of the attribute wrapper inside the devices folder: https://git.astron.nl/lofar2.0/tango/-/tree/master/tangostationcontrol/tangostationcontrol/devices
+You can find example uses of the attribute wrapper inside the devices folder: https://git.astron.nl/lofar2.0/tango/-/tree/master/tangostationcontrol/devices
 
-Inside lofar/tango/tangostationcontrol/tangostationcontrol/devices/lofar_device.py we import the attribute wrapper. Here we also create a dictionary containing all attribute values in the devices with the setup_value_dict method. This dictionary is set up when the device is initialized. This file, together with the opcua_client.py may be of interest as they are created as generic base classes.
+Inside lofar/tango/tangostationcontrol/devices/lofar_device.py we import the attribute wrapper. Here we also create a dictionary containing all attribute values in the devices with the setup_value_dict method. This dictionary is set up when the device is initialized. This file, together with the opcua_client.py may be of interest as they are created as generic base classes.
 
 ## Functions/methods
 `__init__`:
@@ -70,7 +70,7 @@ Attributes can be given any custom data in the `Comms_annotation` argument durin
 
 Clients can be set up in the device, during the initialization and then can be assigned to the attributes by looping through the list of attributes and calling the `set_comm_client` function.
 
-`tangostationcontrol/tangostationcontrol/clients/comms_client.py` provides a generic client class for us and may be of interest.
+`tangostationcontrol/clients/comms_client.py` provides a generic client class for us and may be of interest.
 
 ## Dependencies
 Attribute wrappers wraps around tango attributes. As such, Tango needs to be installed.
diff --git a/tangostationcontrol/tangostationcontrol/clients/__init__.py b/tangostationcontrol/clients/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/clients/__init__.py
rename to tangostationcontrol/clients/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/clients/comms_client.py b/tangostationcontrol/clients/comms_client.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/clients/comms_client.py
rename to tangostationcontrol/clients/comms_client.py
index 3363be9733a413b66e66118eb0c76101f2fb5492..cb6e4fbbd2f122c17366b0b2cf49201f0917851d 100644
--- a/tangostationcontrol/tangostationcontrol/clients/comms_client.py
+++ b/tangostationcontrol/clients/comms_client.py
@@ -239,9 +239,9 @@ class AsyncCommClient(object):
 
                 # don't spin, sleep for a while
                 await asyncio.sleep(2)
-        except asyncio.CancelledError as e:
+        except asyncio.CancelledError:
             pass
-        except Exception as e:
+        except Exception:
             # log immediately, or the exception will only be printed once this task is awaited
             logger.exception(
                 f"[AsyncCommClient {self.name()}] Exception raised while watching"
@@ -280,9 +280,9 @@ class AsyncCommClient(object):
             self.watch_connection_task.cancel()
 
             await self.watch_connection_task
-        except asyncio.CancelledError as e:
+        except asyncio.CancelledError:
             pass
-        except Exception as e:
+        except Exception:
             logger.exception(
                 f"[AsyncCommClient {self.name()}] Watcher thread raised exception"
             )
diff --git a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py b/tangostationcontrol/clients/opcua_client.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/clients/opcua_client.py
rename to tangostationcontrol/clients/opcua_client.py
index 3a165c9331ffeed7bbc9317fe66ad66e8f79fab9..848b42ecba4df3f9f9d508a050eccc6d5186cfaa 100644
--- a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
+++ b/tangostationcontrol/clients/opcua_client.py
@@ -295,7 +295,6 @@ class OPCUAConnection(AsyncCommClient):
     async def _protocol_attribute(
         self, path, dim_x, dim_y, datatype, log_writes: bool = True
     ):
-
         try:
             node = await self.get_node(path)
         except Exception as e:
@@ -450,9 +449,9 @@ class ProtocolAttribute:
             def fix_string(s):
                 return s.encode("latin-1", errors="replace").decode("latin-1")
 
-            if type(value) == list and len(value) > 0 and type(value[0]) == str:
+            if type(value) is list and len(value) > 0 and type(value[0]) is str:
                 value = [fix_string(v) for v in value]
-            elif type(value) == str:
+            elif type(value) is str:
                 value = fix_string(value)
 
             if self.dim_y + self.dim_x == 1:
@@ -484,7 +483,7 @@ class ProtocolAttribute:
             value = numpy.concatenate(value).tolist()
         elif self.dim_x != 1:
             # make sure it is a python array
-            value = value.tolist() if type(value) == numpy.ndarray else value
+            value = value.tolist() if type(value) is numpy.ndarray else value
 
         if self.log_writes:
             logger.info(
@@ -501,7 +500,7 @@ class ProtocolAttribute:
                 #
                 # This is either the conversion us -> opcua in our client, or client -> server.
                 # Report all types involved to allow assessment of the location of the error.
-                if type(value) == list:
+                if type(value) is list:
                     our_type = "list({dtype}) x ({dimensions})".format(
                         dtype=(type(value[0]).__name__ if value else ""),
                         dimensions=len(value),
@@ -543,6 +542,6 @@ async def OPCUA_connection_tester(server, port):
         await client.connect()
         await client.disconnect()
         return True
-    except Exception as e:
+    except Exception:
         logger.debug("Testing OPCua connection failed", exc_info=True)
         return False
diff --git a/tangostationcontrol/tangostationcontrol/clients/snmp/__init__.py b/tangostationcontrol/clients/snmp/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/clients/snmp/__init__.py
rename to tangostationcontrol/clients/snmp/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/clients/snmp/attribute_classes.py b/tangostationcontrol/clients/snmp/attribute_classes.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/clients/snmp/attribute_classes.py
rename to tangostationcontrol/clients/snmp/attribute_classes.py
index ee73ed6c318d9788d4260a7c884086146141226d..431295751a0b07c323aa8ec8ce3a8e8f1170f51e 100644
--- a/tangostationcontrol/tangostationcontrol/clients/snmp/attribute_classes.py
+++ b/tangostationcontrol/clients/snmp/attribute_classes.py
@@ -74,7 +74,7 @@ class SNMPAttribute:
         Write function we give to the attribute wrapper
         """
 
-        if self.is_scalar and type(value) != list:
+        if self.is_scalar and type(value) is not list:
             value = [value]
 
         write_obj = tuple(
diff --git a/tangostationcontrol/tangostationcontrol/clients/snmp/snmp_client.py b/tangostationcontrol/clients/snmp/snmp_client.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/clients/snmp/snmp_client.py
rename to tangostationcontrol/clients/snmp/snmp_client.py
diff --git a/tangostationcontrol/tangostationcontrol/common/__init__.py b/tangostationcontrol/common/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/__init__.py
rename to tangostationcontrol/common/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/common/antennas.py b/tangostationcontrol/common/antennas.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/antennas.py
rename to tangostationcontrol/common/antennas.py
diff --git a/tangostationcontrol/tangostationcontrol/common/atomic.py b/tangostationcontrol/common/atomic.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/atomic.py
rename to tangostationcontrol/common/atomic.py
diff --git a/tangostationcontrol/tangostationcontrol/common/baselines.py b/tangostationcontrol/common/baselines.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/baselines.py
rename to tangostationcontrol/common/baselines.py
diff --git a/tangostationcontrol/tangostationcontrol/common/cables.py b/tangostationcontrol/common/cables.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/cables.py
rename to tangostationcontrol/common/cables.py
diff --git a/tangostationcontrol/tangostationcontrol/common/calibration.py b/tangostationcontrol/common/calibration.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/calibration.py
rename to tangostationcontrol/common/calibration.py
diff --git a/tangostationcontrol/tangostationcontrol/common/configuration.py b/tangostationcontrol/common/configuration.py
similarity index 97%
rename from tangostationcontrol/tangostationcontrol/common/configuration.py
rename to tangostationcontrol/common/configuration.py
index 7bd56f91c57f177b1a23ca996b7851e5ffaeb301..2be1e8d525ac090a915297e221f2a3d9c1e9937b 100644
--- a/tangostationcontrol/tangostationcontrol/common/configuration.py
+++ b/tangostationcontrol/common/configuration.py
@@ -145,7 +145,7 @@ class StationConfiguration:
             device_data = devices_dict.get(device, {})
             server_data = server_dict.setdefault(sname, {})
             instance_data = server_data.setdefault(instance, {})
-            class_data = instance_data.setdefault(sclass, {})
+            instance_data.setdefault(sclass, {})
             # merge the two dictionaries
             server_dict[sname][instance][sclass][device] = device_data
         return server_dict
@@ -169,11 +169,11 @@ class StationConfiguration:
         try:
             tangodb_dict = json.loads(station_configuration)
         except json.JSONDecodeError as e:
-            raise ValueError(f"JSON string not valid") from e
+            raise ValueError("JSON string not valid") from e
         # Check if json adhere to schema
         try:
             self.get_validator().validate(tangodb_dict)
-            logger.info(f"JSON data correctly validated")
+            logger.info("JSON data correctly validated")
         except ValidationError as e:
             raise ValidationError("JSON data does not match schema") from e
         # Select if update or loading configuration from scratch
@@ -199,10 +199,10 @@ class StationConfiguration:
         in TangoDB (also ConfigurationDevice) and
         build the relative SQL query.
         """
-        sql_query = f"SELECT server, class, name FROM device WHERE class != 'DServer' "
+        sql_query = "SELECT server, class, name FROM device WHERE class != 'DServer' "
         for server in default_skip_server_names:
             sql_query += f" AND LOWER(server) !='{server.lower()}' "
-        sql_query += f"ORDER BY server ASC"
+        sql_query += "ORDER BY server ASC"
         return sql_query
 
     def delete_server(self, server: str):
diff --git a/tangostationcontrol/tangostationcontrol/common/constants.py b/tangostationcontrol/common/constants.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/constants.py
rename to tangostationcontrol/common/constants.py
diff --git a/tangostationcontrol/tangostationcontrol/common/consul.py b/tangostationcontrol/common/consul.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/consul.py
rename to tangostationcontrol/common/consul.py
diff --git a/tangostationcontrol/tangostationcontrol/common/device_decorators.py b/tangostationcontrol/common/device_decorators.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/common/device_decorators.py
rename to tangostationcontrol/common/device_decorators.py
index 95162310e8ea18960ab0d67f786cdd7ef62a464b..8ebc07e07cb353fa5df482bf12c50f712a0e4614 100644
--- a/tangostationcontrol/tangostationcontrol/common/device_decorators.py
+++ b/tangostationcontrol/common/device_decorators.py
@@ -89,7 +89,7 @@ def suppress_exceptions(suppress: bool = True):
         def wrapper(device: DeviceProxy, *args, **kwargs):
             try:
                 yield
-            except (SyntaxError, NameError, ImportError) as e:
+            except (SyntaxError, NameError, ImportError):
                 # These exceptions we never suppress
                 raise
             except Exception as e:
@@ -207,7 +207,7 @@ def debugit(log_function=logger.debug):
                 yield
             finally:
                 after = time.monotonic()
-                log_function(f"<<< {func.__name__}, took {(after-before):.2f} s")
+                log_function(f"<<< {func.__name__}, took {(after - before):.2f} s")
 
         return _wrap_sync_or_async(context, func)
 
diff --git a/tangostationcontrol/tangostationcontrol/common/env_decorators.py b/tangostationcontrol/common/env_decorators.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/env_decorators.py
rename to tangostationcontrol/common/env_decorators.py
diff --git a/tangostationcontrol/tangostationcontrol/common/events/__init__.py b/tangostationcontrol/common/events/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/events/__init__.py
rename to tangostationcontrol/common/events/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/common/events/change_events.py b/tangostationcontrol/common/events/change_events.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/common/events/change_events.py
rename to tangostationcontrol/common/events/change_events.py
index eea33317c0b6353830a2a80c98081350457ca6b9..afd6fdf1a49823926354c58f19d265d8105b800c 100644
--- a/tangostationcontrol/tangostationcontrol/common/events/change_events.py
+++ b/tangostationcontrol/common/events/change_events.py
@@ -29,7 +29,7 @@ class ChangeEvents:
     def configure_attribute(self, attr_name: str):
         """Prepares an attribute for emitting custom change events."""
 
-        attr = getattr(self.device, attr_name)
+        getattr(self.device, attr_name)
 
         # tell Tango we will be sending change events ourselves
         # and detecting changes as well.
diff --git a/tangostationcontrol/tangostationcontrol/common/events/register_subscriptions.py b/tangostationcontrol/common/events/register_subscriptions.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/events/register_subscriptions.py
rename to tangostationcontrol/common/events/register_subscriptions.py
diff --git a/tangostationcontrol/tangostationcontrol/common/events/subscriptions.py b/tangostationcontrol/common/events/subscriptions.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/common/events/subscriptions.py
rename to tangostationcontrol/common/events/subscriptions.py
index 60cc6401b33fb9c610238224b70da18947a7f96f..49e280b745cf9289f2253b297422a16c59def492 100644
--- a/tangostationcontrol/tangostationcontrol/common/events/subscriptions.py
+++ b/tangostationcontrol/common/events/subscriptions.py
@@ -194,7 +194,7 @@ class EventSubscriptions:
                 value = proxy.read_attribute(attr_name).value
 
                 callback(proxy, attr_name, value)
-            except Exception as ex:
+            except Exception:
                 logger.exception(
                     f"Callback {callback} for device {proxy} attribute {attr_name} threw an exception"
                 )
diff --git a/tangostationcontrol/tangostationcontrol/common/frequency_bands.py b/tangostationcontrol/common/frequency_bands.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/frequency_bands.py
rename to tangostationcontrol/common/frequency_bands.py
diff --git a/tangostationcontrol/tangostationcontrol/common/health.py b/tangostationcontrol/common/health.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/health.py
rename to tangostationcontrol/common/health.py
diff --git a/tangostationcontrol/tangostationcontrol/common/json_encoder.py b/tangostationcontrol/common/json_encoder.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/json_encoder.py
rename to tangostationcontrol/common/json_encoder.py
diff --git a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py b/tangostationcontrol/common/lofar_logging.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/common/lofar_logging.py
rename to tangostationcontrol/common/lofar_logging.py
index dbbd263896d654cfbd1fb1f584cfc47ba338eabe..a00b5de69a367e6cbba261f023da7f5b83db410b 100644
--- a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
+++ b/tangostationcontrol/common/lofar_logging.py
@@ -177,7 +177,7 @@ def configure_logger(logger: logging.Logger = None, log_extra=None, debug=False)
     handler = logging.StreamHandler()
 
     # Always also log the hostname because it makes the origin of the log clear.
-    hostname = socket.gethostname()
+    socket.gethostname()
 
     formatter = Logfmter(
         keys=["ts", "level", "file", "line", "function"],
diff --git a/tangostationcontrol/tangostationcontrol/common/net.py b/tangostationcontrol/common/net.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/net.py
rename to tangostationcontrol/common/net.py
diff --git a/tangostationcontrol/tangostationcontrol/common/proxies/__init__.py b/tangostationcontrol/common/proxies/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/proxies/__init__.py
rename to tangostationcontrol/common/proxies/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/common/proxies/create_proxies.py b/tangostationcontrol/common/proxies/create_proxies.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/common/proxies/create_proxies.py
rename to tangostationcontrol/common/proxies/create_proxies.py
index ce7fb78d5828a6a542f02df4729e8e2dc563f1aa..5a638aff81f66773d8afb11b67ba3a5c2d1cbc0a 100644
--- a/tangostationcontrol/tangostationcontrol/common/proxies/create_proxies.py
+++ b/tangostationcontrol/common/proxies/create_proxies.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """Device proxy creation from config"""
+
 import abc
 
 import tango
diff --git a/tangostationcontrol/tangostationcontrol/common/proxies/proxy.py b/tangostationcontrol/common/proxies/proxy.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/proxies/proxy.py
rename to tangostationcontrol/common/proxies/proxy.py
diff --git a/tangostationcontrol/tangostationcontrol/common/sdp.py b/tangostationcontrol/common/sdp.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/sdp.py
rename to tangostationcontrol/common/sdp.py
diff --git a/tangostationcontrol/tangostationcontrol/common/states.py b/tangostationcontrol/common/states.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/states.py
rename to tangostationcontrol/common/states.py
diff --git a/tangostationcontrol/tangostationcontrol/common/threading.py b/tangostationcontrol/common/threading.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/threading.py
rename to tangostationcontrol/common/threading.py
diff --git a/tangostationcontrol/tangostationcontrol/common/type_checking.py b/tangostationcontrol/common/type_checking.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/type_checking.py
rename to tangostationcontrol/common/type_checking.py
diff --git a/tangostationcontrol/tangostationcontrol/common/types/__init__.py b/tangostationcontrol/common/types/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/types/__init__.py
rename to tangostationcontrol/common/types/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/common/types/device_config_types.py b/tangostationcontrol/common/types/device_config_types.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/common/types/device_config_types.py
rename to tangostationcontrol/common/types/device_config_types.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/__init__.py b/tangostationcontrol/configuration/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/__init__.py
rename to tangostationcontrol/configuration/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/_json_parser.py b/tangostationcontrol/configuration/_json_parser.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/_json_parser.py
rename to tangostationcontrol/configuration/_json_parser.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/_schemas.py b/tangostationcontrol/configuration/_schemas.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/_schemas.py
rename to tangostationcontrol/configuration/_schemas.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/configuration_base.py b/tangostationcontrol/configuration/configuration_base.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/configuration_base.py
rename to tangostationcontrol/configuration/configuration_base.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/dithering.py b/tangostationcontrol/configuration/dithering.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/dithering.py
rename to tangostationcontrol/configuration/dithering.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/hba.py b/tangostationcontrol/configuration/hba.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/hba.py
rename to tangostationcontrol/configuration/hba.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/observation_field_settings.py b/tangostationcontrol/configuration/observation_field_settings.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/observation_field_settings.py
rename to tangostationcontrol/configuration/observation_field_settings.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/observation_settings.py b/tangostationcontrol/configuration/observation_settings.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/observation_settings.py
rename to tangostationcontrol/configuration/observation_settings.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/pointing.py b/tangostationcontrol/configuration/pointing.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/pointing.py
rename to tangostationcontrol/configuration/pointing.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/sap.py b/tangostationcontrol/configuration/sap.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/sap.py
rename to tangostationcontrol/configuration/sap.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/__init__.py b/tangostationcontrol/configuration/schemas/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/__init__.py
rename to tangostationcontrol/configuration/schemas/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/dithering.json b/tangostationcontrol/configuration/schemas/dithering.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/dithering.json
rename to tangostationcontrol/configuration/schemas/dithering.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/hba.json b/tangostationcontrol/configuration/schemas/hba.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/hba.json
rename to tangostationcontrol/configuration/schemas/hba.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/observation-field-settings.json b/tangostationcontrol/configuration/schemas/observation-field-settings.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/observation-field-settings.json
rename to tangostationcontrol/configuration/schemas/observation-field-settings.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/observation-settings.json b/tangostationcontrol/configuration/schemas/observation-settings.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/observation-settings.json
rename to tangostationcontrol/configuration/schemas/observation-settings.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/pointing.json b/tangostationcontrol/configuration/schemas/pointing.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/pointing.json
rename to tangostationcontrol/configuration/schemas/pointing.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/sap.json b/tangostationcontrol/configuration/schemas/sap.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/sap.json
rename to tangostationcontrol/configuration/schemas/sap.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/sst.json b/tangostationcontrol/configuration/schemas/sst.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/sst.json
rename to tangostationcontrol/configuration/schemas/sst.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/station-configuration.json b/tangostationcontrol/configuration/schemas/station-configuration.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/station-configuration.json
rename to tangostationcontrol/configuration/schemas/station-configuration.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/schemas/xst.json b/tangostationcontrol/configuration/schemas/xst.json
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/schemas/xst.json
rename to tangostationcontrol/configuration/schemas/xst.json
diff --git a/tangostationcontrol/tangostationcontrol/configuration/sst.py b/tangostationcontrol/configuration/sst.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/sst.py
rename to tangostationcontrol/configuration/sst.py
diff --git a/tangostationcontrol/tangostationcontrol/configuration/xst.py b/tangostationcontrol/configuration/xst.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/configuration/xst.py
rename to tangostationcontrol/configuration/xst.py
diff --git a/tangostationcontrol/tangostationcontrol/device_server/__init__.py b/tangostationcontrol/device_server/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/device_server/__init__.py
rename to tangostationcontrol/device_server/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/README.md b/tangostationcontrol/devices/README.md
similarity index 89%
rename from tangostationcontrol/tangostationcontrol/devices/README.md
rename to tangostationcontrol/devices/README.md
index 80fbfe703b9f0ff9e5f3f8675376278acb820dee..6627f2131bf76c8f7a7509df1c752bf4b6fd47fa 100644
--- a/tangostationcontrol/tangostationcontrol/devices/README.md
+++ b/tangostationcontrol/devices/README.md
@@ -12,6 +12,6 @@ If a new device is added, it will (likely) need to be referenced in several plac
 - Add to `infra/env.yaml` the device class.
 - Adjust `tangostationcontrol/devices/__init__.py` to include the new device class and add to `__all__`
 - Add the device class to `/sbin/run_integration_test.sh` list of devices
-- Create `tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_xxx.py` to add an integration test,
+- Create `tangostationcontrol/integration_tests/default/devices/test_device_xxx.py` to add an integration test,
 - Add to `tangostationcontrol/docs/source/devices/` to mention the device in the end-user documentation.
 - Adjust `tangostationcontrol/docs/source/index.rst` to include the newly created file in `docs/source/devices/`.
diff --git a/tangostationcontrol/tangostationcontrol/devices/__init__.py b/tangostationcontrol/devices/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/__init__.py
rename to tangostationcontrol/devices/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield/__init__.py b/tangostationcontrol/devices/antennafield/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/antennafield/__init__.py
rename to tangostationcontrol/devices/antennafield/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield/afh.py b/tangostationcontrol/devices/antennafield/afh.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/antennafield/afh.py
rename to tangostationcontrol/devices/antennafield/afh.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield/afl.py b/tangostationcontrol/devices/antennafield/afl.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/antennafield/afl.py
rename to tangostationcontrol/devices/antennafield/afl.py
index 554255b9d85b81e5c109db5b9904a7c6ff34857a..eafbd0df7800dcefd4edaedee63cebf9874cf523 100644
--- a/tangostationcontrol/tangostationcontrol/devices/antennafield/afl.py
+++ b/tangostationcontrol/devices/antennafield/afl.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """Low Band Antenna Device Server for LOFAR2.0"""
+
 import numpy
 from tango.server import device_property
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/aps.py b/tangostationcontrol/devices/aps.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/aps.py
rename to tangostationcontrol/devices/aps.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/devices/apsct.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/apsct.py
rename to tangostationcontrol/devices/apsct.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/apspu.py b/tangostationcontrol/devices/apspu.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/apspu.py
rename to tangostationcontrol/devices/apspu.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/__init__.py b/tangostationcontrol/devices/base_device_classes/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/__init__.py
rename to tangostationcontrol/devices/base_device_classes/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/antennafield_device.py b/tangostationcontrol/devices/base_device_classes/antennafield_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/antennafield_device.py
rename to tangostationcontrol/devices/base_device_classes/antennafield_device.py
index 6c87e61d519cecd927d77a9639d9501b410da0fe..28f95e0e3b45ea8eee0be5642c92ad59ff3734f5 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/antennafield_device.py
+++ b/tangostationcontrol/devices/base_device_classes/antennafield_device.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """AntennaField Abstract Device Server for LOFAR2.0"""
+
 import logging
 import datetime
 from enum import IntEnum
@@ -319,7 +320,7 @@ class AF(LOFARDevice):
     )
 
     Antenna_to_SDP_Mapping_R = attribute(
-        doc="To which (fpga, input) pair each antenna is connected. " "-1=unconnected.",
+        doc="To which (fpga, input) pair each antenna is connected. -1=unconnected.",
         dtype=((numpy.int32,),),
         max_dim_x=N_pol,
         max_dim_y=MAX_ANTENNA,
@@ -595,8 +596,7 @@ class AF(LOFARDevice):
 
     Antenna_Reference_GEO_R = attribute(
         access=AttrWriteType.READ,
-        doc="Absolute reference position of each tile, "
-        "in latitude/longitude (degrees)",
+        doc="Absolute reference position of each tile, in latitude/longitude (degrees)",
         dtype=((numpy.float64,),),
         max_dim_x=N_latlong,
         max_dim_y=MAX_ANTENNA,
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/async_device.py b/tangostationcontrol/devices/base_device_classes/async_device.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/async_device.py
rename to tangostationcontrol/devices/base_device_classes/async_device.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/beam_device.py b/tangostationcontrol/devices/base_device_classes/beam_device.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/beam_device.py
rename to tangostationcontrol/devices/base_device_classes/beam_device.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/clock_hierarchy.py b/tangostationcontrol/devices/base_device_classes/clock_hierarchy.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/clock_hierarchy.py
rename to tangostationcontrol/devices/base_device_classes/clock_hierarchy.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/control_hierarchy.py b/tangostationcontrol/devices/base_device_classes/control_hierarchy.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/control_hierarchy.py
rename to tangostationcontrol/devices/base_device_classes/control_hierarchy.py
index 1a929f3c98335bc6465f3784d9a739b1cf1c7d50..53aedd19314786f360ea706fada3c514b55ca126 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/control_hierarchy.py
+++ b/tangostationcontrol/devices/base_device_classes/control_hierarchy.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """Control Hierarchy for PyTango devices"""
+
 from typing import Dict
 from typing import Optional
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/hierarchy_device.py b/tangostationcontrol/devices/base_device_classes/hierarchy_device.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/hierarchy_device.py
rename to tangostationcontrol/devices/base_device_classes/hierarchy_device.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py b/tangostationcontrol/devices/base_device_classes/lofar_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py
rename to tangostationcontrol/devices/base_device_classes/lofar_device.py
index 84a4fd3a053d0be097d276d950ae6077ce3b7021..8a3ccf053cbc5bcdbea36b57469ce25bd77b548a 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py
+++ b/tangostationcontrol/devices/base_device_classes/lofar_device.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """Hardware Device Server for LOFAR2.0"""
+
 import json
 import logging
 import math
@@ -151,7 +152,7 @@ class AttributePoller:
         try:
             # try to read the attribute
             return await self._read_attribute(attr_name)
-        except asyncio.CancelledError as e:
+        except asyncio.CancelledError:
             logger.info(f"Polling cancelled during read of {attr_name}")
             raise
         except (
@@ -163,7 +164,7 @@ class AttributePoller:
             # not complain too hard that we cannot poll some attributes when f.e.
             # we are not connected.
             logger.debug(f"Failed to poll attribute {attr_name}: {exception_to_str(e)}")
-        except Exception as e:
+        except Exception:
             logger.exception(f"Failed to poll attribute {attr_name}")
 
         return None
@@ -176,14 +177,14 @@ class AttributePoller:
                 metric.clear()
             else:
                 metric.set_value(value)
-        except Exception as e:
+        except Exception:
             logger.exception(f"Failed to update metric {metric}")
 
     def _send_change_event(self, attr_name: str, value: object | None):
         """Emit a Tango CHANGE_EVENT for the attribute."""
         try:
             self.change_events.send_change_event(attr_name, value)
-        except DevFailed as e:
+        except DevFailed:
             logger.exception(f"Failed to emit change event for {attr_name}")
 
     def polling_allowed(self) -> bool:
@@ -338,7 +339,7 @@ class LOFARDevice(Device):
     )
 
     event_thread_running_R = attribute(
-        doc="Whether the event thread is running." "",
+        doc="Whether the event thread is running.",
         dtype=bool,
         fget=lambda self: self.event_loop_thread
         and self.event_loop_thread.is_running(),
@@ -1032,7 +1033,7 @@ class LOFARDevice(Device):
         # obtain the class information of this attribute, effectively equal
         # to getattr(self, attr_name), but this also makes sure we actually
         # address an attribute.
-        class_attribute = self.get_device_attr().get_attr_by_name(attr_name)
+        self.get_device_attr().get_attr_by_name(attr_name)
 
         # obtain the read function (unwrap PyTango's wrapper to avoid interacting
         # with PyTango internals in there).
@@ -1085,12 +1086,13 @@ class LOFARDevice(Device):
         timeout:     time until an Exception is raised, in seconds.
         pollperiod:  how often to check the attribute, in seconds.
         """
-        if type(value) == type(lambda x: True):
+        if type(value) is type(lambda x: True):
             # evaluate function
             is_correct = value
         else:
             # compare to value
-            is_correct = lambda x: x == value
+            def is_correct(x):
+                return x == value
 
         # Poll every half a second
         for _ in range(math.ceil(timeout / pollperiod)):
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/mapper.py b/tangostationcontrol/devices/base_device_classes/mapper.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/mapper.py
rename to tangostationcontrol/devices/base_device_classes/mapper.py
index 8c9ee691ca98a0c33b72f8a0fa07b63f9be8ebb5..6c984cb17573a6660e798d498fbd293f4656a031 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/mapper.py
+++ b/tangostationcontrol/devices/base_device_classes/mapper.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """Mapper for TANGO devices that share a common attribute"""
+
 from abc import ABC, abstractmethod
 from enum import Enum
 from typing import List, Optional, Dict
@@ -716,9 +717,9 @@ class RecvDeviceWalker:
             if recv <= 0:
                 continue
 
-            recv_ant_masks[recv - 1][rcu_input // N_rcu_inp][
-                rcu_input % N_rcu_inp
-            ] = True
+            recv_ant_masks[recv - 1][rcu_input // N_rcu_inp][rcu_input % N_rcu_inp] = (
+                True
+            )
 
         return recv_ant_masks
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/opcua_device.py b/tangostationcontrol/devices/base_device_classes/opcua_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/opcua_device.py
rename to tangostationcontrol/devices/base_device_classes/opcua_device.py
index 2d282b20f7922805e32d6f706e35e86d2a3441b9..bc634de138234f0ca683256192ce4ad8d29af39f 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/opcua_device.py
+++ b/tangostationcontrol/devices/base_device_classes/opcua_device.py
@@ -192,7 +192,7 @@ class OPCUADevice(LOFARDevice):
             try:
                 if not i.comms_id or i.comms_id == OPCUAConnection:
                     await i.async_set_comm_client(self, self.opcua_connection)
-            except Exception as e:
+            except Exception:
                 # use the pass function instead of setting read/write fails
                 i.set_pass_func(self)
                 annotation = self.opcua_connection._fix_annotation(i.comms_annotation)
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/power_hierarchy.py b/tangostationcontrol/devices/base_device_classes/power_hierarchy.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/power_hierarchy.py
rename to tangostationcontrol/devices/base_device_classes/power_hierarchy.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/proxy_timeout.py b/tangostationcontrol/devices/base_device_classes/proxy_timeout.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/proxy_timeout.py
rename to tangostationcontrol/devices/base_device_classes/proxy_timeout.py
index 36eb2ba7a724c9b24d7673f03a1b7c6eb465aa3c..4a048c58043d43b9467e510f3ce00e118ae06061 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/proxy_timeout.py
+++ b/tangostationcontrol/devices/base_device_classes/proxy_timeout.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """DeviceProxy timeouts for PyTango devices"""
+
 from tango.server import attribute, Device, class_property
 
 __all__ = ["device_proxy_timeout"]
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/recv_device.py b/tangostationcontrol/devices/base_device_classes/recv_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/recv_device.py
rename to tangostationcontrol/devices/base_device_classes/recv_device.py
index c90c6f75ab3dca89fcbfa1575116f5426d40fd2a..53085c9d1a41cbbe2e3a3a4decb922832e6a1213 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/recv_device.py
+++ b/tangostationcontrol/devices/base_device_classes/recv_device.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """RECV Abstract Device Server for LOFAR2.0"""
+
 import logging
 from enum import IntEnum
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/snmp_device.py b/tangostationcontrol/devices/base_device_classes/snmp_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/base_device_classes/snmp_device.py
rename to tangostationcontrol/devices/base_device_classes/snmp_device.py
index c5ef2988150b31383d26e18e6fbe848a7d440407..442a0e621b2898926e1834a67723c455309c7277 100644
--- a/tangostationcontrol/tangostationcontrol/devices/base_device_classes/snmp_device.py
+++ b/tangostationcontrol/devices/base_device_classes/snmp_device.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """SNMP Device Server for LOFAR2.0"""
+
 import asyncio
 import logging
 import os
diff --git a/tangostationcontrol/tangostationcontrol/devices/calibration.py b/tangostationcontrol/devices/calibration.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/calibration.py
rename to tangostationcontrol/devices/calibration.py
index 512ecd94f966029c397983dc636b72c2435e51f2..a29f46c8dc98ad096385efcff88a7e24f4f895b7 100644
--- a/tangostationcontrol/tangostationcontrol/devices/calibration.py
+++ b/tangostationcontrol/devices/calibration.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """Calibration Device Server for LOFAR2.0"""
+
 import logging
 
 from prometheus_client import Counter
@@ -210,7 +211,7 @@ class Calibration(LOFARDevice):
 
             try:
                 self._calibrate_antenna_field(k)
-            except Exception as exc:
+            except Exception:
                 logger.exception("Could not calibrate antenna field %s", k)
 
     # --------
diff --git a/tangostationcontrol/tangostationcontrol/devices/ccd.py b/tangostationcontrol/devices/ccd.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/ccd.py
rename to tangostationcontrol/devices/ccd.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/configuration.py b/tangostationcontrol/devices/configuration.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/configuration.py
rename to tangostationcontrol/devices/configuration.py
index 1518ed445879664c4490420140ea1d1514a4526e..bae7ef3e1cf75f054ea4f9c2824ec0a03539ab13 100644
--- a/tangostationcontrol/tangostationcontrol/devices/configuration.py
+++ b/tangostationcontrol/devices/configuration.py
@@ -6,6 +6,7 @@
 Handles and exposes the station configuration
 
 """
+
 import json
 import logging
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/ec.py b/tangostationcontrol/devices/ec.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/ec.py
rename to tangostationcontrol/devices/ec.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/metadata.py b/tangostationcontrol/devices/metadata.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/metadata.py
rename to tangostationcontrol/devices/metadata.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/ACC.mib b/tangostationcontrol/devices/mibs/ACC.mib
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/ACC.mib
rename to tangostationcontrol/devices/mibs/ACC.mib
index 82cc818f37aa03bf335d58302b7f5c22bda9252a..0e76e3729a435cbd62f7774c2339aa8174f3e3b3 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/ACC.mib
+++ b/tangostationcontrol/devices/mibs/ACC.mib
@@ -6,7 +6,7 @@
 --       CONTACT-INFO "Arild Sageboe, arild.sageboe@power-one.com"
 --       DESCRIPTION "System Information, ACC Power Systems"
 --       ::= { enterprises 5961 }
-	
+
 ACC-MIB DEFINITIONS ::= BEGIN
 
 	IMPORTS
@@ -20,13 +20,13 @@ ACC-MIB DEFINITIONS ::= BEGIN
 
 	powecMIB			OBJECT IDENTIFIER ::= { enterprises 5961 }
 	accPowerSystem 		OBJECT IDENTIFIER ::= { powecMIB 4 }
-		
-	systemInfo 			OBJECT IDENTIFIER ::= { accPowerSystem 1 } 
-	powerSystem			OBJECT IDENTIFIER ::= { accPowerSystem 2 }    
+
+	systemInfo 			OBJECT IDENTIFIER ::= { accPowerSystem 1 }
+	powerSystem			OBJECT IDENTIFIER ::= { accPowerSystem 2 }
 	alarmInfo			OBJECT IDENTIFIER ::= { accPowerSystem 3 }
 	systemParameters		OBJECT IDENTIFIER ::= { accPowerSystem 4 }
 	powecTrap			OBJECT IDENTIFIER ::= { accPowerSystem 99 }
-	
+
 -- SYSTEM INFO variables
 
 systemName OBJECT-TYPE
@@ -76,16 +76,16 @@ batteryDescript OBJECT-TYPE
 	DESCRIPTION
 		"String containing a description of the Battery"
 	::= { systemInfo 6 }
-	
+
 batteryCapacity OBJECT-TYPE
 	SYNTAX INTEGER(0..30000)
 	ACCESS read-write
 	STATUS mandatory
 	DESCRIPTION
 		"An integer containing battery capacity in Ah"
-		
+
 	::= { systemInfo 7 }
-	
+
 -- POWER SYSTEM variables
 
 systemVoltage		OBJECT-TYPE
@@ -119,7 +119,7 @@ rectifierCurrent	OBJECT-TYPE
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing the rectifier current (current * 10)"
-	::= { powerSystem 4 }  
+	::= { powerSystem 4 }
 
 battTemperature	OBJECT-TYPE
 	SYNTAX INTEGER
@@ -127,15 +127,15 @@ battTemperature	OBJECT-TYPE
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing the battery temperature(Degree C)"
-	::= { powerSystem 5 }  
-	
+	::= { powerSystem 5 }
+
 acPhase1Voltage	OBJECT-TYPE
 	SYNTAX INTEGER
 	ACCESS read-only
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing AC input voltage for phase 1 (Volt), (-1) means measurement not available"
-	::= { powerSystem 6 }  
+	::= { powerSystem 6 }
 
 acPhase2Voltage	OBJECT-TYPE
 	SYNTAX INTEGER
@@ -143,7 +143,7 @@ acPhase2Voltage	OBJECT-TYPE
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing AC input voltage for phase 2 (Volt), (-1) means measurement not available"
-	::= { powerSystem 7 }  
+	::= { powerSystem 7 }
 
 acPhase3Voltage	OBJECT-TYPE
 	SYNTAX INTEGER
@@ -151,7 +151,7 @@ acPhase3Voltage	OBJECT-TYPE
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing AC input voltage for phase 3 (Volt), (-1) means measurement not available"
-	::= { powerSystem 8 }  
+	::= { powerSystem 8 }
 
 remainBatteryTime	OBJECT-TYPE
 	SYNTAX INTEGER
@@ -159,12 +159,12 @@ remainBatteryTime	OBJECT-TYPE
 	STATUS mandatory
 	DESCRIPTION
 		"A variable containing the remaining battery time in (minutes)"
-	::= { powerSystem 9 }  
+	::= { powerSystem 9 }
 
 -- ALARM INFO variables (Alarm and Status Information)
 -- The alarmData, extraAlarmData and statusData
--- are integers from 0-255 containing the byte value received 
--- from the controlmodule. 
+-- are integers from 0-255 containing the byte value received
+-- from the controlmodule.
 
 numbOfAlarms	OBJECT-TYPE
 	SYNTAX INTEGER(0..100)
@@ -197,7 +197,7 @@ alarmData3	OBJECT-TYPE
 	DESCRIPTION
 		"A byte containing alarm data 3"
 	::= { alarmInfo 4 }
-	
+
 extraAlarmData1	OBJECT-TYPE
 	SYNTAX INTEGER(0..255)
 	ACCESS read-only
@@ -205,7 +205,7 @@ extraAlarmData1	OBJECT-TYPE
 	DESCRIPTION
 		"A byte containing extra alarm data 1"
 	::= { alarmInfo 5 }
-	
+
 extraAlarmData2	OBJECT-TYPE
 	SYNTAX INTEGER(0..255)
 	ACCESS read-only
@@ -441,7 +441,7 @@ lowVoltReconLim	OBJECT-TYPE
 	DESCRIPTION
 		"A variable containing the Low Voltage Reconnect Limit (Volt*10)"
 	::= { systemParameters 8 }
-	
+
 partLoadDiscon1Limit	OBJECT-TYPE
 	SYNTAX INTEGER(0..30000)
 	ACCESS read-write
@@ -476,7 +476,7 @@ highVoltLim	OBJECT-TYPE
 	DESCRIPTION
 		"A variable containing the High Voltage Limit (Volt*10)"
 	::= { systemParameters 12 }
-	
+
 highVoltDisconLim	OBJECT-TYPE
 	SYNTAX INTEGER(0..30000)
 	ACCESS read-write
@@ -758,7 +758,7 @@ highVoltTrap TRAP-TYPE
     DESCRIPTION
             "High DC Voltage Alarm"
     ::= 2
-    
+
 loadBattDisconTrap TRAP-TYPE
     ENTERPRISE powecTrap
     VARIABLES {
@@ -1088,5 +1088,5 @@ u4SpareTrap TRAP-TYPE
     DESCRIPTION
             "System output reference changed to Spare"
     ::= 43
- 
+
 END
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/PowerNet-MIB.mib b/tangostationcontrol/devices/mibs/PowerNet-MIB.mib
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/PowerNet-MIB.mib
rename to tangostationcontrol/devices/mibs/PowerNet-MIB.mib
index a07f9745691922bacf9e46a4557e3ac82e1e0032..286d5f1d2d71188d1c1b47c7242275cbc2a624f4 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/PowerNet-MIB.mib
+++ b/tangostationcontrol/devices/mibs/PowerNet-MIB.mib
@@ -260,7 +260,7 @@
 -- 03/11/2019         Added oid upsAdvConfigACQualificationTime.
 -- 10/29/2019         Added oid upsHighPrecExtdBatteryTemperature.
 --                    Added traps upsInputContactOutputRelayFault, upsInputContactOutputRelayFaultCleared, upsAirFilterWarning, upsAirFilterWarningCleared
---                    upsBatteryPackIncompatible, upsBatteryPackIncompatibleCleared, upsInputContactAbnormal, upsInputContactAbnormalCleared, 
+--                    upsBatteryPackIncompatible, upsBatteryPackIncompatibleCleared, upsInputContactAbnormal, upsInputContactAbnormalCleared,
 --                    upsOutputRelayAbnormal, upsOutputRelayAbnormalCleared.
 
 
@@ -4680,9 +4680,9 @@ xPDUBranchBreakerTable OBJECT-TYPE
            configured as a remote drop.
            Note: When setting branch circuit thresholds/ratings for an entry,
            all positions tied (see the xPDUBranchBreakerTieIndicator OID)
-           to this entry will inherit the new threshold/rating."  
-       ::= { xPDUBranchBreakerEntry 2 }           
-         
+           to this entry will inherit the new threshold/rating."
+       ::= { xPDUBranchBreakerEntry 2 }
+
    xPDUBranchBreakerRDPFeed OBJECT-TYPE
        SYNTAX INTEGER  {
           remoteDistribution   (1),
@@ -6190,7 +6190,7 @@ pmmBranchCircuitBreakerOpenAlarm OBJECT-TYPE
          3 will indicate unknown."
     ::= { pmmBranchBreakerEntry 22 }
 
--- charger group 
+-- charger group
 
 chargerIdentModel OBJECT-TYPE
     SYNTAX DisplayString
@@ -6226,7 +6226,7 @@ chargerIdentModelType OBJECT-TYPE
    DESCRIPTION
       "The detailed model information of the Charger."
    ::= { chargerIdent 4 }
-   
+
 -- Input Phase Table
 
 chargerInputPhaseTable OBJECT-TYPE
@@ -6301,7 +6301,7 @@ chargerInputPhaseCurrent OBJECT-TYPE
    ::= { chargerInputPhaseEntry 5 }
 
  -- end of Input table
- 
+
  -- the charger output group
 chargerOutputStatus OBJECT-TYPE
    SYNTAX INTEGER  {
@@ -6320,7 +6320,7 @@ chargerOutputStatus OBJECT-TYPE
        determine the state of the Charger this variable is set
        to unknown(1)."
    ::= { chargerOutput 1 }
-   
+
 chargerOutputVauxVoltage OBJECT-TYPE
    SYNTAX Gauge
    ACCESS read-only
@@ -6328,7 +6328,7 @@ chargerOutputVauxVoltage OBJECT-TYPE
    DESCRIPTION
       "The Load output voltage, measured in VDC."
    ::= { chargerOutput 2 }
-   
+
 chargerOutputTotalCurrent OBJECT-TYPE
    SYNTAX Gauge
    ACCESS read-only
@@ -6336,7 +6336,7 @@ chargerOutputTotalCurrent OBJECT-TYPE
    DESCRIPTION
       "The current in amperes drawn by the load on the Charger."
    ::= { chargerOutput 3 }
- 
+
 chargerOutputLoad OBJECT-TYPE
    SYNTAX Gauge
    ACCESS read-only
@@ -13732,7 +13732,7 @@ upsBasicIdentFamilyName OBJECT-TYPE
    DESCRIPTION
       "The UPS model family name for the product."
    ::= { upsBasicIdent 3 }
-   
+
 upsBasicIdentModelType OBJECT-TYPE
    SYNTAX DisplayString
    ACCESS read-only
@@ -13894,8 +13894,8 @@ upsAdvBatteryTemperature OBJECT-TYPE
    STATUS mandatory
    DESCRIPTION
       "The current internal UPS temperature expressed in
-       Celsius. Temperatures below zero read as 0. 
-       
+       Celsius. Temperatures below zero read as 0.
+
        Consider using upsHighPrecExtdBatteryTemperature instead."
    ::= { upsAdvBattery 2 }
 
@@ -14268,7 +14268,7 @@ upsAdvBatteryTotalCapacity OBJECT-TYPE
          The value is updated continuously, for example when battery breakers are opened or closed,
          or when battery strings/battery blocks are added or removed."
   ::= { upsAdvBattery 25 }
-   
+
 upsAdvBatteryFuseStatus  OBJECT-TYPE
   SYNTAX INTEGER {
       fuseOpen(1),
@@ -14333,7 +14333,7 @@ upsHighPrecBatteryTemperature OBJECT-TYPE
       "The current internal UPS temperature expressed in
        tenths of degrees Celsius. Temperatures below zero
        read as 0.
-       
+
        Consider using upsHighPrecExtdBatteryTemperature instead."
    ::= { upsHighPrecBattery 2 }
 
@@ -14368,7 +14368,7 @@ upsHighPrecTotalDCCurrent OBJECT-TYPE
    DESCRIPTION
       "The total DC current in tenths of Amps."
    ::= { upsHighPrecBattery 6 }
-   
+
 -- High Precision Actual Battery Voltage Table
 
    upsHighPrecBatteryActualVoltageTable OBJECT-TYPE
@@ -14971,7 +14971,7 @@ upsHighPrecExtdBatteryTemperature OBJECT-TYPE
         "The voltage for the second side/half of the battery in a split battery system.
         If it is not a split battery, this reports -1"
        ::= { upsBatteryCabinetEntry 5 }
-       
+
    upsBatteryCabinetCurrentPolarity1 OBJECT-TYPE
        SYNTAX     INTEGER
        ACCESS     read-only
@@ -15008,7 +15008,7 @@ upsHighPrecExtdBatteryTemperature OBJECT-TYPE
         of measured temperatures.
         If there is battery string information, it is the highest actual battery string temperature value."
        ::= { upsBatteryCabinetEntry 9 }
-       
+
    upsBatteryCabinetMinTemperature OBJECT-TYPE
        SYNTAX     INTEGER
        ACCESS     read-only
@@ -15667,7 +15667,7 @@ upsAdvInputEnergyUsage OBJECT-TYPE
    DESCRIPTION
       "The input energy usage of the UPS in kWh."
    ::= { upsAdvInput 15 }
-   
+
 upsAdvInputDCVoltage OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
@@ -15675,7 +15675,7 @@ upsAdvInputDCVoltage OBJECT-TYPE
    DESCRIPTION
       "The DC input voltage in Volts."
    ::= { upsAdvInput 16 }
-      
+
 upsAdvInputDCCurrent OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
@@ -15683,7 +15683,7 @@ upsAdvInputDCCurrent OBJECT-TYPE
    DESCRIPTION
       "The DC input current in Amps."
    ::= { upsAdvInput 17 }
-  
+
 -- the upsHighPrecInput group
 
 upsHighPrecInputLineVoltage OBJECT-TYPE
@@ -15780,14 +15780,14 @@ upsBasicOutputStatus OBJECT-TYPE
    DESCRIPTION
       "The current state of the UPS. If the UPS is unable to
        determine the state of the UPS this variable is set
-       to unknown(1). 
-       
-       During self-test most UPSes report onBattery(3) but 
-       some that support it will report onBatteryTest(15). 
-       To determine self-test status across all UPSes, refer 
+       to unknown(1).
+
+       During self-test most UPSes report onBattery(3) but
+       some that support it will report onBatteryTest(15).
+       To determine self-test status across all UPSes, refer
        to the upsBasicStateOutputState OID."
    ::= { upsBasicOutput 1 }
-  
+
 upsBasicOutputPhase OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
@@ -18584,16 +18584,16 @@ upsOutputRelayConfigPeakPeriod OBJECT-TYPE
    DESCRIPTION
       "An ASCII string containing the 64 flags representing
       the peak period setting of the UPS. Flags are numbered 1-64
-      starting from the left. Each flag is either a '1', 
-      representing a flag that is set, or a '0', representing 
+      starting from the left. Each flag is either a '1',
+      representing a flag that is set, or a '0', representing
       a flag that is /not/ set.
-      
+
       The peak period intervals are times that are both:
       - on the days of the week set by the first 7 flags AND
       - within the time periods set by the remaining flags.
-      
-      UPS output relays triggered by 'On battery except peak period' 
-      will not signal when the UPS is on battery during a peak period. 
+
+      UPS output relays triggered by 'On battery except peak period'
+      will not signal when the UPS is on battery during a peak period.
 
       The flags are defined as follows:
 
@@ -18676,24 +18676,24 @@ upsOutputRelayConfigPeakPeriod OBJECT-TYPE
       Flag 62: <Not Used>
       Flag 63: <Not Used>
       Flag 64: <Not Used>
-      
+
       To set this OID you can either:
-      - set the 64 flag bits as an ASCII string of '1's and '0's 
+      - set the 64 flag bits as an ASCII string of '1's and '0's
         as described above. The same format is used when this OID
         is read.
-      - or turn on/off an individual flags. 
-      
+      - or turn on/off an individual flags.
+
       Examples:
-      
-      Set for Sundays and Tuesdays from 00:00-01:29: 
+
+      Set for Sundays and Tuesdays from 00:00-01:29:
       1010000111000000000000000000000000000000000000000000000000000000
-      
+
       Set Mondays to be part of the peak periods:
       +2
-      
+
       Set Tuesdays to not be part of the peak periods:
       -3
-      
+
       Include interval 23:30-23:59 in the peak period:
       +55"
    ::= { upsOutputRelays 6 }
@@ -19524,7 +19524,7 @@ currentStatus OBJECT-TYPE
        DESCRIPTION
                "The input voltage in VAC, or -1 if it's unsupported
                by this UPS."
-       ::= { upsPhaseInputPhaseEntry 3 }	   	   
+       ::= { upsPhaseInputPhaseEntry 3 }
 
    upsPhaseInputMaxVoltage OBJECT-TYPE
        SYNTAX     INTEGER
@@ -19626,7 +19626,7 @@ currentStatus OBJECT-TYPE
        DESCRIPTION
                "The input power factor measured in hundredth."
        ::= { upsPhaseInputPhaseEntry 13 }
-	   
+
      upsPhaseInputVoltagePN OBJECT-TYPE
        SYNTAX     INTEGER
        ACCESS     read-only
@@ -19634,7 +19634,7 @@ currentStatus OBJECT-TYPE
        DESCRIPTION
                "The input voltage measured across Phase to Neutral in VAC, or -1 if it's unsupported
                by this UPS."
-       ::= { upsPhaseInputPhaseEntry 14 }		   
+       ::= { upsPhaseInputPhaseEntry 14 }
    --
    -- The Output group.
    --
@@ -19990,7 +19990,7 @@ currentStatus OBJECT-TYPE
        DESCRIPTION
                "Output voltage in VAC measured at the output of inverter."
        ::= { upsPhaseOutputPhaseEntry 21 }
-	   
+
    upsPhaseOutputVoltagePN OBJECT-TYPE
        SYNTAX     INTEGER
        ACCESS     read-only
@@ -23812,7 +23812,7 @@ upsDiagnosticSLCModelNumber OBJECT-TYPE
        lostComm(7) indicates the device has lost communication."
    ::= { upsDiagnosticSLC 5 }
 
--- upsDiagnosticTemperature   
+-- upsDiagnosticTemperature
 upsDiagnosticTemperatureAmbientTemperature OBJECT-TYPE
    SYNTAX     INTEGER
    ACCESS     read-only
@@ -23822,7 +23822,7 @@ upsDiagnosticTemperatureAmbientTemperature OBJECT-TYPE
             If not available, this variable is set to (-1999)."
    ::= { upsDiagnosticTemperature 1 }
 
-   
+
 -- upsDiagnosticUnitContoller group
 
   upsDiagUnitControllerTableSize OBJECT-TYPE
@@ -24503,7 +24503,7 @@ upsParallelSysUpsSerialNumber OBJECT-TYPE
          "The Serial number of the UPS in parallel.
          Equivalent to OID 1.3.6.1.4.1.318.1.1.1.1.2.3 (upsAdvIdentSerialNumber)."
       ::= { upsParallelSysUpsEntry 5 }
-   
+
 upsParallelNumOfUpsPoweringLoad OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
@@ -29460,7 +29460,7 @@ rPDU2IdentContact OBJECT-TYPE
       "A user-defined string identifying the
       person to contact regarding the Rack PDU"
    ::= { rPDU2IdentEntry 10 }
-   
+
 rPDU2IdentBootMonitorRev OBJECT-TYPE
    SYNTAX DisplayString
    ACCESS read-only
@@ -29468,15 +29468,15 @@ rPDU2IdentBootMonitorRev OBJECT-TYPE
    DESCRIPTION
       "The Rack PDU Boot Monitor version"
    ::= { rPDU2IdentEntry 11 }
-   
+
  rPDU2IdentLongDescription OBJECT-TYPE
    SYNTAX DisplayString
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
       "The Rack PDU Long Description name"
-   ::= { rPDU2IdentEntry 12 } 
-   
+   ::= { rPDU2IdentEntry 12 }
+
  rPDU2IdentNMCSerialNumber OBJECT-TYPE
    SYNTAX DisplayString
    ACCESS read-only
@@ -29750,7 +29750,7 @@ RPDU2DevicePropertiesEntry ::=
       rPDU2DevicePropertiesOrientation             INTEGER,
       rPDU2DevicePropertiesOutletLayout            INTEGER,
       rPDU2DevicePropertiesMaxPhaseCurrentRating   INTEGER,
-      rPDU2DevicePropertiesDevicePowerRating       INTEGER      
+      rPDU2DevicePropertiesDevicePowerRating       INTEGER
    }
 
 rPDU2DevicePropertiesIndex OBJECT-TYPE
@@ -29902,7 +29902,7 @@ rPDU2DevicePropertiesMaxPhaseCurrentRating OBJECT-TYPE
       "The maximum current rating, measured in Amps, for
        the Rack PDU"
    ::= { rPDU2DevicePropertiesEntry 12 }
-   
+
 
 rPDU2DevicePropertiesDevicePowerRating OBJECT-TYPE
    SYNTAX INTEGER
@@ -29913,7 +29913,7 @@ rPDU2DevicePropertiesDevicePowerRating OBJECT-TYPE
         the Rack PDU"
    ::= { rPDU2DevicePropertiesEntry 13 }
 
-   
+
 -- rPDU2 Device Status
 
 rPDU2DeviceStatusTable OBJECT-TYPE
@@ -30767,8 +30767,8 @@ RPDU2BankPropertiesEntry ::=
    SEQUENCE {
       rPDU2BankPropertiesIndex                  INTEGER,
       rPDU2BankPropertiesModule                 INTEGER,
-      rPDU2BankPropertiesNumber                 INTEGER,      
-      rPDU2BankPropertiesPhaseLayout            Rpdu2OutletPhaseLayoutType,   
+      rPDU2BankPropertiesNumber                 INTEGER,
+      rPDU2BankPropertiesPhaseLayout            Rpdu2OutletPhaseLayoutType,
       rPDU2BankPropertiesBreakerRating          INTEGER
    }
 
@@ -30823,16 +30823,16 @@ rPDU2BankPropertiesPhaseLayout OBJECT-TYPE
       seqPhase3ToPhase1(6) indicates that bank outlets are
       wired from Phase 3 to Phase 1."
    ::= { rPDU2BankPropertiesEntry 4 }
-   
+
 
 rPDU2BankPropertiesBreakerRating OBJECT-TYPE
    SYNTAX INTEGER
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
-      "If bank circuit breakers are present on the device, this OID will return 
+      "If bank circuit breakers are present on the device, this OID will return
 	   the rating of the breaker in Amps."
-   ::= { rPDU2BankPropertiesEntry 5 }   
+   ::= { rPDU2BankPropertiesEntry 5 }
 
 -- rPDU2 Bank Status
 
@@ -30937,8 +30937,8 @@ rPDU2BankStatusPeakCurrentStartTime OBJECT-TYPE
    DESCRIPTION
       "Indicates the date and time of the last bank peak current reset"
    ::= { rPDU2BankStatusEntry 8 }
-   
-   
+
+
 -- rPDU2 Outlet Data
 
 rPDU2Outlet                    OBJECT IDENTIFIER ::=  { rPDU2 9 }
@@ -30984,7 +30984,7 @@ RPDU2OutletSwitchedConfigEntry ::=
       rPDU2OutletSwitchedConfigPowerOnTime      INTEGER,
       rPDU2OutletSwitchedConfigPowerOffTime     INTEGER,
       rPDU2OutletSwitchedConfigRebootDuration   INTEGER,
-      rPDU2OutletSwitchedConfigExternalLink     DisplayString   
+      rPDU2OutletSwitchedConfigExternalLink     DisplayString
    }
 
 rPDU2OutletSwitchedConfigIndex OBJECT-TYPE
@@ -31062,9 +31062,9 @@ SYNTAX DisplayString
 ACCESS read-write
 STATUS mandatory
 DESCRIPTION
-    "User-defined external device web link. 
+    "User-defined external device web link.
      Possible use cases could be the IP address of the external device
-     plugged into the outlet or its manufacturer web page for convenient 
+     plugged into the outlet or its manufacturer web page for convenient
      support such as user manuals, specifications, drivers, etc."
 ::= { rPDU2OutletSwitchedConfigEntry 8 }
 
@@ -31194,9 +31194,9 @@ RPDU2OutletSwitchedStatusEntry ::=
       rPDU2OutletSwitchedStatusModule           INTEGER,
       rPDU2OutletSwitchedStatusName             DisplayString,
       rPDU2OutletSwitchedStatusNumber           INTEGER,
-      rPDU2OutletSwitchedStatusState            INTEGER,      
+      rPDU2OutletSwitchedStatusState            INTEGER,
       rPDU2OutletSwitchedStatusCommandPending   INTEGER,
-      rPDU2OutletSwitchedStatusExternalLink     DisplayString             
+      rPDU2OutletSwitchedStatusExternalLink     DisplayString
    }
 
 rPDU2OutletSwitchedStatusIndex OBJECT-TYPE
@@ -31268,13 +31268,13 @@ rPDU2OutletSwitchedStatusExternalLink OBJECT-TYPE
    ACCESS read-only
    STATUS mandatory
    DESCRIPTION
-      "Each RPDU outlet can have its own external web URL link. 
-       This can be configured in the rPDU2OutletSwitchedConfigExternalLink OID.  
-       When this link is clicked in the web interface, the linked URL will 
+      "Each RPDU outlet can have its own external web URL link.
+       This can be configured in the rPDU2OutletSwitchedConfigExternalLink OID.
+       When this link is clicked in the web interface, the linked URL will
        open in the web browser."
    ::= { rPDU2OutletSwitchedStatusEntry 7 }
 
- 
+
 -- rPDU2 Switched Outlet Control
 
 rPDU2OutletSwitchedControlTable OBJECT-TYPE
@@ -31426,9 +31426,9 @@ RPDU2OutletMeteredConfigEntry ::=
       rPDU2OutletMeteredConfigName                          DisplayString,
       rPDU2OutletMeteredConfigNumber                        INTEGER,
       rPDU2OutletMeteredConfigLowLoadCurrentThreshold       INTEGER,
-      rPDU2OutletMeteredConfigNearOverloadCurrentThreshold  INTEGER,          
+      rPDU2OutletMeteredConfigNearOverloadCurrentThreshold  INTEGER,
       rPDU2OutletMeteredConfigOverloadCurrentThreshold      INTEGER,
-      rPDU2OutletMeteredConfigExternalLink                  DisplayString         
+      rPDU2OutletMeteredConfigExternalLink                  DisplayString
    }
 
 rPDU2OutletMeteredConfigIndex OBJECT-TYPE
@@ -31495,11 +31495,11 @@ SYNTAX DisplayString
 ACCESS read-write
 STATUS mandatory
 DESCRIPTION
-    "User-defined external device web link. 
+    "User-defined external device web link.
      Possible use cases could be the IP address of the external device
-     plugged into the outlet or its manufacturer web page for convenient 
+     plugged into the outlet or its manufacturer web page for convenient
      support such as user manuals, specifications, drivers, etc."
-::= { rPDU2OutletMeteredConfigEntry 8 }   
+::= { rPDU2OutletMeteredConfigEntry 8 }
 
 -- rPDU2 Metered Outlet Properties
 
@@ -31642,7 +31642,7 @@ RPDU2OutletMeteredStatusEntry ::=
       rPDU2OutletMeteredStatusPeakPowerStartTime   DisplayString,
       rPDU2OutletMeteredStatusEnergy               INTEGER,
       rPDU2OutletMeteredStatusReceptacleType       DisplayString,
-      rPDU2OutletMeteredStatusExternalLink         DisplayString          
+      rPDU2OutletMeteredStatusExternalLink         DisplayString
    }
 
 rPDU2OutletMeteredStatusIndex OBJECT-TYPE
@@ -31754,20 +31754,20 @@ rPDU2OutletMeteredStatusReceptacleType OBJECT-TYPE
    STATUS mandatory
    DESCRIPTION
       "Indicates receptacle type for the outlet."
-   ::= { rPDU2OutletMeteredStatusEntry 12 }  
-   
-   
+   ::= { rPDU2OutletMeteredStatusEntry 12 }
+
+
 rPDU2OutletMeteredStatusExternalLink OBJECT-TYPE
 SYNTAX DisplayString
 ACCESS read-only
 STATUS mandatory
 DESCRIPTION
-      "Each RPDU outlet can have its own external web URL link. 
-	   This can be configured in the rPDU2OutletMeteredConfigExternalLink OID.  
-	   When this link is clicked in the web interface, the linked URL will 
+      "Each RPDU outlet can have its own external web URL link.
+	   This can be configured in the rPDU2OutletMeteredConfigExternalLink OID.
+	   When this link is clicked in the web interface, the linked URL will
 	   open in the web browser."
-::= { rPDU2OutletMeteredStatusEntry 13 }   
-   
+::= { rPDU2OutletMeteredStatusEntry 13 }
+
 -- rPDU2 Sensor Data
 
 rPDU2Sensor                    OBJECT IDENTIFIER ::=  { rPDU2 10 }
@@ -82552,7 +82552,7 @@ epoActivated TRAP-TYPE
    --#HELPTAG 0
    --#STATE DEGRADED
    ::= 723
-   
+
 
 xATSS1BadPhaseRotation TRAP-TYPE
   ENTERPRISE apc
@@ -84125,7 +84125,7 @@ upsAirFilterWarningCleared TRAP-TYPE
    --#HELPTAG 0
    --#STATE OPERATIONAL
    ::= 805
-   
+
 upsBatteryPackIncompatible TRAP-TYPE
    ENTERPRISE apc
    VARIABLES { mtrapargsString }
@@ -84174,7 +84174,7 @@ upsInputContactAbnormalCleared TRAP-TYPE
    ENTERPRISE apc
    VARIABLES { mtrapargsString }
    DESCRIPTION
-      "INFORMATIONAL: UPS input contact has returned to its normal 
+      "INFORMATIONAL: UPS input contact has returned to its normal
        state."
    --#TYPE "APC UPS: Input contact has returned to the normal state."
    --#SUMMARY "UPS input contact has returned to the normal state."
@@ -84203,7 +84203,7 @@ upsOutputRelayAbnormalCleared TRAP-TYPE
    ENTERPRISE apc
    VARIABLES { mtrapargsString }
    DESCRIPTION
-      "INFORMATIONAL: A UPS output relay has returned to its normal 
+      "INFORMATIONAL: A UPS output relay has returned to its normal
        state."
    --#TYPE "APC UPS: Output relay back in normal state."
    --#SUMMARY "UPS output relay back in normal state."
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1212.mib b/tangostationcontrol/devices/mibs/RFC-1212.mib
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1212.mib
rename to tangostationcontrol/devices/mibs/RFC-1212.mib
index eedb74a9a914b1c39badfd84227d4e9934374a70..488bba91f32b131e8a84e6ecb929a6bf1033556c 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1212.mib
+++ b/tangostationcontrol/devices/mibs/RFC-1212.mib
@@ -5,7 +5,7 @@ IMPORTS
         FROM RFC1155-SMI
     DisplayString
         FROM RFC1158-MIB;
- 
+
 OBJECT-TYPE MACRO ::=
 BEGIN
     TYPE NOTATION ::=
@@ -19,7 +19,7 @@ BEGIN
                       IndexPart
                       DefValPart
     VALUE NOTATION ::= value (VALUE ObjectName)
- 
+
     Access ::= "read-only"
                     | "read-write"
                     | "write-only"
@@ -28,15 +28,15 @@ BEGIN
                     | "optional"
                     | "obsolete"
                     | "deprecated"
- 
+
     DescrPart ::=
                "DESCRIPTION" value (description DisplayString)
                     | empty
- 
+
     ReferPart ::=
                "REFERENCE" value (reference DisplayString)
                     | empty
- 
+
     IndexPart ::=
                "INDEX" "{" IndexTypes "}"
                     | empty
@@ -50,12 +50,12 @@ BEGIN
                         -- otherwise use named SMI type
                         -- must conform to IndexSyntax below
                     | type (indextype)
- 
+
     DefValPart ::=
                "DEFVAL" "{" value (defvalue ObjectSyntax) "}"
                     | empty
    END
- 
+
 IndexSyntax ::=
     CHOICE {
         number
@@ -71,4 +71,3 @@ IndexSyntax ::=
     }
 
 END
- 
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1215.mib b/tangostationcontrol/devices/mibs/RFC-1215.mib
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1215.mib
rename to tangostationcontrol/devices/mibs/RFC-1215.mib
index 64327233787654a8a20e1083711d6dc85e0d18c1..cc013529381e9e90d7faa143d8f80a8fc359d79b 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC-1215.mib
+++ b/tangostationcontrol/devices/mibs/RFC-1215.mib
@@ -1,8 +1,8 @@
 
 RFC-1215 DEFINITIONS ::= BEGIN
 
--- This  module is a empty module.  It has been created solely for the 
--- purpose of allowing other modules to correctly import the TRAP-TYPE 
+-- This  module is a empty module.  It has been created solely for the
+-- purpose of allowing other modules to correctly import the TRAP-TYPE
 -- clause from RFC-1215 where it should be imported from.  It's a
 -- built in type in the UCD-SNMP code, and in fact RFC-1215 doesn't
 -- actually define a mib at all; it only defines macros.  However,
@@ -33,6 +33,6 @@ BEGIN
                "REFERENCE" value (reference DisplayString)
                | empty
 END
- 
+
 
 END
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC1155-SMI.mib b/tangostationcontrol/devices/mibs/RFC1155-SMI.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/RFC1155-SMI.mib
rename to tangostationcontrol/devices/mibs/RFC1155-SMI.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC1158-MIB.mib b/tangostationcontrol/devices/mibs/RFC1158-MIB.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/RFC1158-MIB.mib
rename to tangostationcontrol/devices/mibs/RFC1158-MIB.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC1213-MIB.mib b/tangostationcontrol/devices/mibs/RFC1213-MIB.mib
similarity index 92%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/RFC1213-MIB.mib
rename to tangostationcontrol/devices/mibs/RFC1213-MIB.mib
index 53ae0e9c6bb29ed5ae494c9f96d165ca9c2f02d0..c4a026f40e7a23f38a88e12d3a489228eabbcf39 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/RFC1213-MIB.mib
+++ b/tangostationcontrol/devices/mibs/RFC1213-MIB.mib
@@ -285,238 +285,238 @@ ifDescr OBJECT-TYPE
 
 ifType OBJECT-TYPE
     SYNTAX  INTEGER {
-                   other(1),          
+                   other(1),
                    regular1822(2),
                    hdh1822(3),
                    ddnX25(4),
                    rfc877x25(5),
-                   ethernetCsmacd(6), 
-                   iso88023Csmacd(7), 
+                   ethernetCsmacd(6),
+                   iso88023Csmacd(7),
                    iso88024TokenBus(8),
                    iso88025TokenRing(9),
                    iso88026Man(10),
-                   starLan(11), 
+                   starLan(11),
                    proteon10Mbit(12),
                    proteon80Mbit(13),
                    hyperchannel(14),
                    fddi(15),
                    lapb(16),
                    sdlc(17),
-                   ds1(18),            
-                   e1(19),             
+                   ds1(18),
+                   e1(19),
                    basicISDN(20),
                    primaryISDN(21),
-                   propPointToPointSerial(22), 
+                   propPointToPointSerial(22),
                    ppp(23),
                    softwareLoopback(24),
-                   eon(25),            
+                   eon(25),
                    ethernet3Mbit(26),
-                   nsip(27),           
-                   slip(28),           
-                   ultra(29),          
-                   ds3(30),            
-                   sip(31),            
-                   frameRelay(32),     
+                   nsip(27),
+                   slip(28),
+                   ultra(29),
+                   ds3(30),
+                   sip(31),
+                   frameRelay(32),
                    rs232(33),
-                   para(34),           
-                   arcnet(35),         
-                   arcnetPlus(36),     
-                   atm(37),            
+                   para(34),
+                   arcnet(35),
+                   arcnetPlus(36),
+                   atm(37),
                    miox25(38),
-                   sonet(39),          
+                   sonet(39),
                    x25ple(40),
                    iso88022llc(41),
                    localTalk(42),
                    smdsDxi(43),
-                   frameRelayService(44),  
+                   frameRelayService(44),
                    v35(45),
                    hssi(46),
                    hippi(47),
-                   modem(48),          
-                   aal5(49),           
+                   modem(48),
+                   aal5(49),
                    sonetPath(50),
                    sonetVT(51),
-                   smdsIcip(52),       
-                   propVirtual(53),    
+                   smdsIcip(52),
+                   propVirtual(53),
                    propMultiplexor(54),
-                   ieee80212(55),      
-                   fibreChannel(56),   
-                   hippiInterface(57), 
-                   frameRelayInterconnect(58), 
-                   aflane8023(59),     
-                   aflane8025(60),     
-                   cctEmul(61),        
-                   fastEther(62),      
-                   isdn(63),           
-                   v11(64),            
-                   v36(65),            
-                   g703at64k(66),      
-                   g703at2mb(67),      
-                   qllc(68),           
-                   fastEtherFX(69),    
-                   channel(70),        
-                   ieee80211(71),      
-	           ibm370parChan(72),  
-                   escon(73),          
-                   dlsw(74),           
-                   isdns(75),          
-                   isdnu(76),          
-                   lapd(77),           
-                   ipSwitch(78),       
-                   rsrb(79),           
-                   atmLogical(80),     
-                   ds0(81),            
-                   ds0Bundle(82),      
-                   bsc(83),            
-                   async(84),          
-                   cnr(85),            
-                   iso88025Dtr(86),    
-                   eplrs(87),          
-                   arap(88),           
-                   propCnls(89),       
-                   hostPad(90),        
-                   termPad(91),        
-                   frameRelayMPI(92),  
-                   x213(93),           
-                   adsl(94),           
-                   radsl(95),          
-                   sdsl(96),           
-                   vdsl(97),           
-                   iso88025CRFPInt(98), 
-                   myrinet(99),        
-                   voiceEM(100),       
-                   voiceFXO(101),      
-                   voiceFXS(102),      
-                   voiceEncap(103),    
-                   voiceOverIp(104),   
-                   atmDxi(105),        
-                   atmFuni(106),       
-		   atmIma (107),       
-                   pppMultilinkBundle(108), 
-                   ipOverCdlc (109),   
-		   ipOverClaw (110),   
-                   stackToStack (111), 
-                   virtualIpAddress (112), 
-		   mpc (113),          
-		   ipOverAtm (114),    
-		   iso88025Fiber (115), 
-		   tdlc (116),	       
-		   gigabitEthernet (117), 
-		   hdlc (118),         
-		   lapf (119),	       
-		   v37 (120),	       
-		   x25mlp (121),       
-		   x25huntGroup (122), 
-		   trasnpHdlc (123),   
-		   interleave (124),   
-		   fast (125),         
-		   ip (126),	       
-		   docsCableMaclayer (127),  
-		   docsCableDownstream (128), 
-		   docsCableUpstream (129),  
-		   a12MppSwitch (130), 
-		   tunnel (131),       
-		   coffee (132),       
-		   ces (133),          
-		   atmSubInterface (134), 
-		   l2vlan (135),       
-		   l3ipvlan (136),     
-		   l3ipxvlan (137),    
-		   digitalPowerline (138), 
-		   mediaMailOverIp (139), 
-		   dtm (140),        
-		   dcn (141),    
-		   ipForward (142),    
-		   msdsl (143),       
-		   ieee1394 (144), 
-		   if-gsn (145),       
-		   dvbRccMacLayer (146), 
-		   dvbRccDownstream (147),  
-		   dvbRccUpstream (148),  
-		   atmVirtual (149),   
-		   mplsTunnel (150),   
-		   srp (151),	
-		   voiceOverAtm (152),  
-		   voiceOverFrameRelay (153),   
-		   idsl (154),		
-		   compositeLink (155),  
-		   ss7SigLink (156),     
-		   propWirelessP2P (157),  
-		   frForward (158),    
-		   rfc1483 (159),	
-		   usb (160),		
-		   ieee8023adLag (161),  
-                   bgppolicyaccounting (162), 
-                   frf16MfrBundle (163), 
-                   h323Gatekeeper (164), 
-                   h323Proxy (165), 
-                   mpls (166), 
-                   mfSigLink (167), 
-                   hdsl2 (168), 
-                   shdsl (169), 
-                   ds1FDL (170), 
-                   pos (171), 
-                   dvbAsiIn (172), 
-                   dvbAsiOut (173), 
-                   plc (174), 
-                   nfas (175), 
-                   tr008 (176), 
-                   gr303RDT (177), 
-                   gr303IDT (178), 
-                   isup (179), 
-                   propDocsWirelessMaclayer (180), 
-                   propDocsWirelessDownstream (181), 
-                   propDocsWirelessUpstream (182), 
-                   hiperlan2 (183), 
-                   propBWAp2Mp (184), 
-                   sonetOverheadChannel (185), 
-                   digitalWrapperOverheadChannel (186), 
-                   aal2 (187), 
-                   radioMAC (188), 
-                   atmRadio (189), 
-                   imt (190), 
-                   mvl (191), 
-                   reachDSL (192), 
-                   frDlciEndPt (193), 
-                   atmVciEndPt (194), 
-                   opticalChannel (195), 
-                   opticalTransport (196), 
-                   propAtm (197), 
-                   voiceOverCable (198), 
-                   infiniband (199), 
-                   teLink (200), 
-                   q2931 (201), 
-                   virtualTg (202), 
-                   sipTg (203), 
-                   sipSig (204), 
-                   docsCableUpstreamChannel (205), 
-                   econet (206), 
-                   pon155 (207), 
-                   pon622 (208), 
-                   bridge (209), 
-                   linegroup (210), 
-                   voiceEMFGD (211), 
-                   voiceFGDEANA (212), 
-                   voiceDID (213), 
-                   mpegTransport (214), 
-                   sixToFour (215), 
-                   gtp (216), 
-                   pdnEtherLoop1 (217), 
-                   pdnEtherLoop2 (218), 
-                   opticalChannelGroup (219), 
-                   homepna (220), 
-                   gfp (221), 
-                   ciscoISLvlan (222), 
-                   actelisMetaLOOP (223), 
-                   fcipLink (224), 
-                   rpr (225), 
+                   ieee80212(55),
+                   fibreChannel(56),
+                   hippiInterface(57),
+                   frameRelayInterconnect(58),
+                   aflane8023(59),
+                   aflane8025(60),
+                   cctEmul(61),
+                   fastEther(62),
+                   isdn(63),
+                   v11(64),
+                   v36(65),
+                   g703at64k(66),
+                   g703at2mb(67),
+                   qllc(68),
+                   fastEtherFX(69),
+                   channel(70),
+                   ieee80211(71),
+	           ibm370parChan(72),
+                   escon(73),
+                   dlsw(74),
+                   isdns(75),
+                   isdnu(76),
+                   lapd(77),
+                   ipSwitch(78),
+                   rsrb(79),
+                   atmLogical(80),
+                   ds0(81),
+                   ds0Bundle(82),
+                   bsc(83),
+                   async(84),
+                   cnr(85),
+                   iso88025Dtr(86),
+                   eplrs(87),
+                   arap(88),
+                   propCnls(89),
+                   hostPad(90),
+                   termPad(91),
+                   frameRelayMPI(92),
+                   x213(93),
+                   adsl(94),
+                   radsl(95),
+                   sdsl(96),
+                   vdsl(97),
+                   iso88025CRFPInt(98),
+                   myrinet(99),
+                   voiceEM(100),
+                   voiceFXO(101),
+                   voiceFXS(102),
+                   voiceEncap(103),
+                   voiceOverIp(104),
+                   atmDxi(105),
+                   atmFuni(106),
+		   atmIma (107),
+                   pppMultilinkBundle(108),
+                   ipOverCdlc (109),
+		   ipOverClaw (110),
+                   stackToStack (111),
+                   virtualIpAddress (112),
+		   mpc (113),
+		   ipOverAtm (114),
+		   iso88025Fiber (115),
+		   tdlc (116),
+		   gigabitEthernet (117),
+		   hdlc (118),
+		   lapf (119),
+		   v37 (120),
+		   x25mlp (121),
+		   x25huntGroup (122),
+		   trasnpHdlc (123),
+		   interleave (124),
+		   fast (125),
+		   ip (126),
+		   docsCableMaclayer (127),
+		   docsCableDownstream (128),
+		   docsCableUpstream (129),
+		   a12MppSwitch (130),
+		   tunnel (131),
+		   coffee (132),
+		   ces (133),
+		   atmSubInterface (134),
+		   l2vlan (135),
+		   l3ipvlan (136),
+		   l3ipxvlan (137),
+		   digitalPowerline (138),
+		   mediaMailOverIp (139),
+		   dtm (140),
+		   dcn (141),
+		   ipForward (142),
+		   msdsl (143),
+		   ieee1394 (144),
+		   if-gsn (145),
+		   dvbRccMacLayer (146),
+		   dvbRccDownstream (147),
+		   dvbRccUpstream (148),
+		   atmVirtual (149),
+		   mplsTunnel (150),
+		   srp (151),
+		   voiceOverAtm (152),
+		   voiceOverFrameRelay (153),
+		   idsl (154),
+		   compositeLink (155),
+		   ss7SigLink (156),
+		   propWirelessP2P (157),
+		   frForward (158),
+		   rfc1483 (159),
+		   usb (160),
+		   ieee8023adLag (161),
+                   bgppolicyaccounting (162),
+                   frf16MfrBundle (163),
+                   h323Gatekeeper (164),
+                   h323Proxy (165),
+                   mpls (166),
+                   mfSigLink (167),
+                   hdsl2 (168),
+                   shdsl (169),
+                   ds1FDL (170),
+                   pos (171),
+                   dvbAsiIn (172),
+                   dvbAsiOut (173),
+                   plc (174),
+                   nfas (175),
+                   tr008 (176),
+                   gr303RDT (177),
+                   gr303IDT (178),
+                   isup (179),
+                   propDocsWirelessMaclayer (180),
+                   propDocsWirelessDownstream (181),
+                   propDocsWirelessUpstream (182),
+                   hiperlan2 (183),
+                   propBWAp2Mp (184),
+                   sonetOverheadChannel (185),
+                   digitalWrapperOverheadChannel (186),
+                   aal2 (187),
+                   radioMAC (188),
+                   atmRadio (189),
+                   imt (190),
+                   mvl (191),
+                   reachDSL (192),
+                   frDlciEndPt (193),
+                   atmVciEndPt (194),
+                   opticalChannel (195),
+                   opticalTransport (196),
+                   propAtm (197),
+                   voiceOverCable (198),
+                   infiniband (199),
+                   teLink (200),
+                   q2931 (201),
+                   virtualTg (202),
+                   sipTg (203),
+                   sipSig (204),
+                   docsCableUpstreamChannel (205),
+                   econet (206),
+                   pon155 (207),
+                   pon622 (208),
+                   bridge (209),
+                   linegroup (210),
+                   voiceEMFGD (211),
+                   voiceFGDEANA (212),
+                   voiceDID (213),
+                   mpegTransport (214),
+                   sixToFour (215),
+                   gtp (216),
+                   pdnEtherLoop1 (217),
+                   pdnEtherLoop2 (218),
+                   opticalChannelGroup (219),
+                   homepna (220),
+                   gfp (221),
+                   ciscoISLvlan (222),
+                   actelisMetaLOOP (223),
+                   fcipLink (224),
+                   rpr (225),
                    qam (226), -- RF Qam Interface
                    lmp (227), -- Link Management Protocol
                    cblVectaStar (228), -- Cambridge Broadband Limited VectaStar
                    docsCableMCmtsDownstream (229), -- CATV Modular CMTS Downstream Interface
-                   adsl2 (230), -- Asymmetric Digital Subscriber Loop Version 2 
+                   adsl2 (230), -- Asymmetric Digital Subscriber Loop Version 2
                                 -- (DEPRECATED/OBSOLETED - please use adsl2plus 238 instead)
-                   macSecControlledIF (231), -- MACSecControlled 
+                   macSecControlledIF (231), -- MACSecControlled
                    macSecUncontrolledIF (232), -- MACSecUncontrolled
                    aviciOpticalEther (233), -- Avici Optical Ethernet Aggregate
                    atmbond (234), -- atmbond
@@ -524,7 +524,7 @@ ifType OBJECT-TYPE
                    mocaVersion1 (236), -- MultiMedia over Coax Alliance (MoCA) Interface
                              -- as documented in information provided privately to IANA
                    ieee80216WMAN (237), -- IEEE 802.16 WMAN interface
-                   adsl2plus (238), -- Asymmetric Digital Subscriber Loop Version 2, 
+                   adsl2plus (238), -- Asymmetric Digital Subscriber Loop Version 2,
                                    -- Version 2 Plus and all variants
                    dvbRcsMacLayer (239), -- DVB-RCS MAC Layer
                    dvbTdm (240), -- DVB Satellite TDM
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-CONF.mib b/tangostationcontrol/devices/mibs/SNMPv2-CONF.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-CONF.mib
rename to tangostationcontrol/devices/mibs/SNMPv2-CONF.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-MIB.mib b/tangostationcontrol/devices/mibs/SNMPv2-MIB.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-MIB.mib
rename to tangostationcontrol/devices/mibs/SNMPv2-MIB.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-SMI.mib b/tangostationcontrol/devices/mibs/SNMPv2-SMI.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-SMI.mib
rename to tangostationcontrol/devices/mibs/SNMPv2-SMI.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-TC.mib b/tangostationcontrol/devices/mibs/SNMPv2-TC.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/SNMPv2-TC.mib
rename to tangostationcontrol/devices/mibs/SNMPv2-TC.mib
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/SP2-MIB.mib b/tangostationcontrol/devices/mibs/SP2-MIB.mib
similarity index 92%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/SP2-MIB.mib
rename to tangostationcontrol/devices/mibs/SP2-MIB.mib
index fbcc43479b4b321d51198e7043771e3f9bb41f76..dda235a99254b77a953eca246233d281c2f16b89 100644
--- a/tangostationcontrol/tangostationcontrol/devices/mibs/SP2-MIB.mib
+++ b/tangostationcontrol/devices/mibs/SP2-MIB.mib
@@ -1,16 +1,16 @@
 
 -- Mon Aug 8 2016: Added support for inverter, grid inverter and rectiverter.
--- 
+--
 -- $Revision:91$
 -- $Author: jujino$
 -- $Archive: Documents/EltekEnexusPowersystem.mib$
 -- $Date: 22. oktober 2021 11:22:11$
--- 
+--
 
 SP2-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
-	NOTIFICATION-TYPE, OBJECT-TYPE, MODULE-IDENTITY, 
+	NOTIFICATION-TYPE, OBJECT-TYPE, MODULE-IDENTITY,
 	enterprises, Unsigned32, Counter32, Integer32
 		FROM SNMPv2-SMI
 	NOTIFICATION-GROUP
@@ -20,9 +20,9 @@ IMPORTS
 
 eltek MODULE-IDENTITY
 	LAST-UPDATED "201306271334Z"
-	ORGANIZATION 
+	ORGANIZATION
 		"ELTEK power System MIB Working Group"
-	CONTACT-INFO 
+	CONTACT-INFO
 		"Eltek R&D.
 		         Postal: Eltek AS
 		         P.O. Box 3043
@@ -32,7 +32,7 @@ eltek MODULE-IDENTITY
 		         Fax: +47-32 20 31 20
 		         web:  www.eltek.com
 		         "
-	DESCRIPTION 
+	DESCRIPTION
 		"An ongoing effort toward a generic MIB for all ELTEK products.
 		         Branch overview:
 		         Aeongold branch will be 1
@@ -50,41 +50,41 @@ eltek MODULE-IDENTITY
 		         ELTEK Distributed V6 branch will be 9 (SmartPack2 sw V1.1, V1.2, V1.3)
 		         ELTEK Distributed V7 branch will be 9 (SmartPack w/WebPower sw V4.1, V4.2, V4.3, V4.5, V4.6, V4.7 and compack V1.04, V1.05)
 		         ELTEK eNexus MIB branch will be 10 (SmartPack2 Touch V2.x, Smartpack R V2.x, SmartPack2 V2.x, SmartPack S V2.x and Compack V2.x)
-		         ELTEK Brasil office will have branch 11 
+		         ELTEK Brasil office will have branch 11
 		         ELTEK BMS-EM MIB will have branch 12
 		         ELTEK TELMEX MIB will have branch 13
 		         ELTEK MSM MIB will have branch 14
 		                        "
 
 	REVISION "201306271033Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"added support for rectifier group, mains group, battery group and flexi monitor"
 
 	REVISION "201111250958Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"additional values to all alarm status enums"
 
 	REVISION "201110171334Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"Major changes in OID order and names; added mains monitor energy log and generator fail status"
 
 	REVISION "201108190916Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"hopefully final version. Stared implementation of eltek api"
 
 	REVISION "201108190947Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"adjustment"
 
 	REVISION "201105091128Z"
-	DESCRIPTION 
+	DESCRIPTION
 		"fixed up mains group"
 ::= { enterprises 12148 }
 
 
 -- Supported by SmartPack2 Touch, Smartpack R, SmartPack2, Smartpack S and Compack products
 -- SNMP V1,V2c and V3.
--- 
+--
 
 eNexus               OBJECT IDENTIFIER ::= { eltek 10 }
 
@@ -92,15 +92,15 @@ eNexus               OBJECT IDENTIFIER ::= { eltek 10 }
 
 eltekTraps           OBJECT IDENTIFIER ::= { eNexus 1 }
 
--- These are variable bindings used by the traps defined in  powerSystemTraps branch. 
+-- These are variable bindings used by the traps defined in  powerSystemTraps branch.
 
 powerAlarmVars       OBJECT IDENTIFIER ::= { eltekTraps 1 }
 
 -- The generic Subsystem Traps, a generic trap for each sub system.
 -- There are many alarm sources for each subsystem.
--- 
+--
 --  A list of the power plant subsystems:
--- 
+--
 --  1. Battery
 --  2. Load
 --  3. Mains
@@ -112,21 +112,21 @@ powerAlarmVars       OBJECT IDENTIFIER ::= { eltekTraps 1 }
 --  9. solarCharger
 --  10. windcharger
 --  11. inverter
--- 
--- Each trap contains subsystem status, text description of the alarm source, 
--- alarm status var, subsystem Status OID, subsystem Status Value, 
+--
+-- Each trap contains subsystem status, text description of the alarm source,
+-- alarm status var, subsystem Status OID, subsystem Status Value,
 -- OID of the variable indicated the Measured value and the Measured value itself.
 
 powerSystemTraps     OBJECT IDENTIFIER ::= { eltekTraps 2 }
 
 -- This branch contains OID's for configuration of the power system's
 -- basic factory data and the power system's installation settings.
--- 
--- 
+--
+--
 
 powerSystem          OBJECT IDENTIFIER ::= { eNexus 2 }
 
--- This branch contains OIDs related to the Mains/AC feed subsystem. 
+-- This branch contains OIDs related to the Mains/AC feed subsystem.
 -- Here you will find info about mains status, voltages, currents, fuses, and mains monitor units
 
 mains                OBJECT IDENTIFIER ::= { eNexus 3 }
@@ -143,10 +143,10 @@ mainsMonitors        OBJECT IDENTIFIER ::= { mains 5 }
 
 mainsOutageLog       OBJECT IDENTIFIER ::= { mains 6 }
 
--- This branch contains OIDs related to the systems (Diesel)Generator subsystem. 
--- Here you will find info about the generator running status, start/stop criteria, fuel tank monitoring, 
--- and energy delivery history. 
--- 
+-- This branch contains OIDs related to the systems (Diesel)Generator subsystem.
+-- Here you will find info about the generator running status, start/stop criteria, fuel tank monitoring,
+-- and energy delivery history.
+--
 
 generator            OBJECT IDENTIFIER ::= { eNexus 4 }
 
@@ -174,14 +174,14 @@ generatorFailure     OBJECT IDENTIFIER ::= { generator 27 }
 
 generatorBattVoltageControlledStop  OBJECT IDENTIFIER ::= { generator 28 }
 
--- This branch contains OIDs related to the Rectifiers subsystem. 
--- Here you will find info about the rectifiers status, capacity and health, currents and 
+-- This branch contains OIDs related to the Rectifiers subsystem.
+-- Here you will find info about the rectifiers status, capacity and health, currents and
 -- energy consumption history
--- 
+--
 
 rectifiers           OBJECT IDENTIFIER ::= { eNexus 5 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectifiersCurrent    OBJECT IDENTIFIER ::= { rectifiers 2 }
@@ -202,8 +202,8 @@ rectifiersEnergyLog  OBJECT IDENTIFIER ::= { rectifiers 7 }
 
 rectifiersTemperature  OBJECT IDENTIFIER ::= { rectifiers 18 }
 
--- This branch contains OIDs related to the DCDC converter subsystem. 
--- Here you will find info about the dcdc status, capacity and health, currents and 
+-- This branch contains OIDs related to the DCDC converter subsystem.
+-- Here you will find info about the dcdc status, capacity and health, currents and
 -- converted-energy history
 
 dcdc                 OBJECT IDENTIFIER ::= { eNexus 6 }
@@ -212,10 +212,10 @@ dcdc                 OBJECT IDENTIFIER ::= { eNexus 6 }
 
 dcdcObsolete         OBJECT IDENTIFIER ::= { dcdc 7 }
 
--- This branch contains OIDs related to the Solar charger subsystem. 
--- Here you will find info about the Solar charger status, capacity and health, currents and 
+-- This branch contains OIDs related to the Solar charger subsystem.
+-- Here you will find info about the Solar charger status, capacity and health, currents and
 -- energy delivery history
--- 
+--
 
 solarChargers        OBJECT IDENTIFIER ::= { eNexus 7 }
 
@@ -235,8 +235,8 @@ solarChargersError   OBJECT IDENTIFIER ::= { solarChargers 4 }
 
 solarChargersEnergyLog  OBJECT IDENTIFIER ::= { solarChargers 7 }
 
--- This branch contains OIDs related to the Wind charger subsystem. 
--- Here you will find info about the Wind charger status, capacity and health, currents and 
+-- This branch contains OIDs related to the Wind charger subsystem.
+-- Here you will find info about the Wind charger status, capacity and health, currents and
 -- energy delivery history
 
 windChargers         OBJECT IDENTIFIER ::= { eNexus 8 }
@@ -257,10 +257,10 @@ windChargersError    OBJECT IDENTIFIER ::= { windChargers 4 }
 
 windChargersEnergyLog  OBJECT IDENTIFIER ::= { windChargers 7 }
 
--- This branch contains OIDs related to the Load subsystem. 
+-- This branch contains OIDs related to the Load subsystem.
 -- Here you will find info about load status, currents, fuses,  contactors
 -- and load monitor units
--- 
+--
 
 load                 OBJECT IDENTIFIER ::= { eNexus 9 }
 
@@ -273,16 +273,16 @@ loadCurrent          OBJECT IDENTIFIER ::= { load 2 }
 loadEnergyLog        OBJECT IDENTIFIER ::= { load 8 }
 
 -- This branch contains all avalable information about the power systems battery subsystem.
--- Here is data about battery health, condition, test results, monitoring equipment battery banks/strings, 
--- battery breakers and disconnection systems. 
+-- Here is data about battery health, condition, test results, monitoring equipment battery banks/strings,
+-- battery breakers and disconnection systems.
 -- Note that this branch represents battery group 1 in a system with battery groups.
 
 battery              OBJECT IDENTIFIER ::= { eNexus 10 }
 
--- This is one of many 'data monitors' found throughout the power system.  
--- The 'data monitors' is found on several levels on all subsystems and they all act as 
+-- This is one of many 'data monitors' found throughout the power system.
+-- The 'data monitors' is found on several levels on all subsystems and they all act as
 -- trap sources. Whenever a status changes in a 'data monitor', a trap in its parent
--- subsystem may be sendt.  The data monitor branches can easily be recognised by the 
+-- subsystem may be sendt.  The data monitor branches can easily be recognised by the
 -- presence of a xxxxTrapRepeatCounter node.
 
 batteryVoltage       OBJECT IDENTIFIER ::= { battery 5 }
@@ -315,7 +315,7 @@ batteryTotalCapacity  OBJECT IDENTIFIER ::= { battery 11 }
 
 batteryQuality       OBJECT IDENTIFIER ::= { battery 12 }
 
--- This branch contains OIDs related to the Battery Disconnect. 
+-- This branch contains OIDs related to the Battery Disconnect.
 
 batteryLVBD          OBJECT IDENTIFIER ::= { battery 13 }
 
@@ -384,16 +384,16 @@ batteryModuleCommError  OBJECT IDENTIFIER ::= { batteryModule 3 }
 
 inputs               OBJECT IDENTIFIER ::= { eNexus 11 }
 
--- This branch contains OIDs related to the systems Alarm output relays status. 
--- 
+-- This branch contains OIDs related to the systems Alarm output relays status.
+--
 
 outputs              OBJECT IDENTIFIER ::= { eNexus 12 }
 
--- This branch contains OIDs related to the Controlsystem subsystem. 
--- Here you will find info about controller status and inventory. I/O units 
--- with outdoor related functionality is placed here. Current/Flexi Monitors with 
--- programmable system types and functionalities.There is also some pushbuttons for 
--- resetting alarms and reread system inventory. 
+-- This branch contains OIDs related to the Controlsystem subsystem.
+-- Here you will find info about controller status and inventory. I/O units
+-- with outdoor related functionality is placed here. Current/Flexi Monitors with
+-- programmable system types and functionalities.There is also some pushbuttons for
+-- resetting alarms and reread system inventory.
 
 controlSystem        OBJECT IDENTIFIER ::= { eNexus 13 }
 
@@ -405,7 +405,7 @@ snmp                 OBJECT IDENTIFIER ::= { controlSystem 4 }
 
 controlSystemIoUnits  OBJECT IDENTIFIER ::= { controlSystem 7 }
 
--- This branch contains control system inventory, including control unit description, status, serial 
+-- This branch contains control system inventory, including control unit description, status, serial
 -- number, hardware part number, hardware version, software part number and software version.
 
 controlSystemInventory  OBJECT IDENTIFIER ::= { controlSystem 8 }
@@ -474,21 +474,21 @@ demandResponse       OBJECT IDENTIFIER ::= { controlSystem 25 }
 
 tariffControl        OBJECT IDENTIFIER ::= { controlSystem 31 }
 
--- This branch contains OIDs related to the systems alarm groups. The alarm groups are internal entities 
+-- This branch contains OIDs related to the systems alarm groups. The alarm groups are internal entities
 -- that serves as input sources for the Alarm outputs
 
 alarmGroups          OBJECT IDENTIFIER ::= { eNexus 14 }
 
 -- This branch contains all avalable information about the battery group 2 in a system with battery groups.
--- Here is data about battery health, condition, test results, monitoring equipment battery banks/strings, 
+-- Here is data about battery health, condition, test results, monitoring equipment battery banks/strings,
 -- battery breakers and disconnection systems.
 
 batteryGroup2        OBJECT IDENTIFIER ::= { eNexus 15 }
 
--- This is one of many 'data monitors' found throughout the power system.  
--- The 'data monitors' is found on several levels on all subsystems and they all act as 
+-- This is one of many 'data monitors' found throughout the power system.
+-- The 'data monitors' is found on several levels on all subsystems and they all act as
 -- trap sources. Whenever a status changes in a 'data monitor', a trap in its parent
--- subsystem may be sendt.  The data monitor branches can easily be recognised by the 
+-- subsystem may be sendt.  The data monitor branches can easily be recognised by the
 -- presence of a xxxxTrapRepeatCounter node.
 
 batteryGroup2Voltage  OBJECT IDENTIFIER ::= { batteryGroup2 5 }
@@ -521,7 +521,7 @@ batteryGroup2TotalCapacity  OBJECT IDENTIFIER ::= { batteryGroup2 11 }
 
 batteryGroup2Quality  OBJECT IDENTIFIER ::= { batteryGroup2 12 }
 
--- This branch contains OIDs related to the Battery Disconnect of battery group 2. 
+-- This branch contains OIDs related to the Battery Disconnect of battery group 2.
 
 batteryGroup2LVBD    OBJECT IDENTIFIER ::= { batteryGroup2 13 }
 
@@ -562,10 +562,10 @@ batteryGroup2AhCharged  OBJECT IDENTIFIER ::= { batteryGroup2 22 }
 
 batteryGroup2AhDischarged  OBJECT IDENTIFIER ::= { batteryGroup2 23 }
 
--- This branch contains OIDs related to the Inverters subsystem. 
--- Here you will find info about the inverters status, capacity and health, currents and 
+-- This branch contains OIDs related to the Inverters subsystem.
+-- Here you will find info about the inverters status, capacity and health, currents and
 -- energy consumption history
--- 
+--
 
 inverters            OBJECT IDENTIFIER ::= { eNexus 16 }
 
@@ -605,21 +605,21 @@ invertersAcVoltage3  OBJECT IDENTIFIER ::= { inverters 9 }
 
 invertersAcFrequencyDeviation  OBJECT IDENTIFIER ::= { inverters 10 }
 
--- This branch contains OIDs related to the grid inverters subsystem. 
--- Here you will find info about the inverters status, capacity and health, currents and 
+-- This branch contains OIDs related to the grid inverters subsystem.
+-- Here you will find info about the inverters status, capacity and health, currents and
 -- energy consumption history
--- 
+--
 
 gridInvertersObsolete  OBJECT IDENTIFIER ::= { eNexus 17 }
 
--- This branch contains OIDs related to the Rectiverters subsystem. 
--- Here you will find info about the rectifiers status, capacity and health, currents and 
+-- This branch contains OIDs related to the Rectiverters subsystem.
+-- Here you will find info about the rectifiers status, capacity and health, currents and
 -- energy consumption history
--- 
+--
 
 rectiverters         OBJECT IDENTIFIER ::= { eNexus 18 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersDcCurrent  OBJECT IDENTIFIER ::= { rectiverters 2 }
@@ -632,37 +632,37 @@ rectivertersError    OBJECT IDENTIFIER ::= { rectiverters 3 }
 
 rectivertersTemperature  OBJECT IDENTIFIER ::= { rectiverters 4 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutCurrent1  OBJECT IDENTIFIER ::= { rectiverters 5 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutCurrent2  OBJECT IDENTIFIER ::= { rectiverters 6 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutCurrent3  OBJECT IDENTIFIER ::= { rectiverters 7 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutVoltage1  OBJECT IDENTIFIER ::= { rectiverters 8 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutVoltage2  OBJECT IDENTIFIER ::= { rectiverters 9 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectifier.
 
 rectivertersAcOutVoltage3  OBJECT IDENTIFIER ::= { rectiverters 10 }
 
--- This branch contains information about the total rectifier current, which is calculated 
+-- This branch contains information about the total rectifier current, which is calculated
 -- by summing up current from each rectiverter.
 
 rectivertersAcFrequencyDeviation  OBJECT IDENTIFIER ::= { rectiverters 11 }
@@ -688,26 +688,26 @@ alarmSubsysSourceDescr  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"A description of the source generating the trap for the Alarm Condition. 
-		Used in alarmSubSystemTrap to describe the alarm source. 
+	DESCRIPTION
+		"A description of the source generating the trap for the Alarm Condition.
+		Used in alarmSubSystemTrap to describe the alarm source.
 		Example: 'batteryVoltageDescription'"
 	::= { powerAlarmVars 1 }
 
 -- status var and value of trap variables
--- 
+--
 
 alarmSubsysStatusOid  OBJECT-TYPE
 	SYNTAX     OBJECT IDENTIFIER
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The OID (name) of the object indicating the alarm-status for which the alarm is 
+	DESCRIPTION
+		"The OID (name) of the object indicating the alarm-status for which the alarm is
 		generated.  The Status must be an INTEGER  type.
-		
+
 		Example: SP2-MIB::batteryVoltage.batteryVoltageStatus
 		1.3.6.1.4.1.12148.10.3.5.2:
-		
+
 		This object maybe polled by the SNMP management application,
 		to monitor the current Status object."
 	::= { powerAlarmVars 2 }
@@ -737,12 +737,12 @@ alarmSubsysStatusValue  OBJECT-TYPE
 	}
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the Status object of the subsystem for which the
 		alarm-status is generated. The OID (name) of this object is
 		indicated by alarmSubsysStatusOid above.
-		
-		
+
+
 		Example: the value of SP2-MIB::batteryVoltage.batteryVoltageStatus
 		one of: error (0), normal (1), minorAlarm (2), etc."
 	::= { powerAlarmVars 3 }
@@ -754,24 +754,24 @@ alarmSubsysStatusOnOff  OBJECT-TYPE
 	}
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This indicates if the abnormal condition is on or goes off."
 	::= { powerAlarmVars 4 }
 
 -- measured var and value of trap variables
--- 
+--
 
 alarmMeasuredVarOid  OBJECT-TYPE
 	SYNTAX     OBJECT IDENTIFIER
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The OID (name) of the measured-object indicating some
 		measurement (e.g voltage) for which the alarm is generated.
-		
+
 		Example: SP2-MIB::batteryVoltage.batteryVoltageValue
 		1.3.6.1.4.1.12148.10.3.5.1
-		
+
 		This object maybe polled by the SNMP management application,
 		to monitor the current measurement."
 	::= { powerAlarmVars 5 }
@@ -780,15 +780,15 @@ alarmMeasuredVarValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured-object for which the alarm-status
 		is generated, for example 13 volt. The actual value is in
 		units defined by the actual variable (e.g volts). The units
 		must use INTEGER type.
-		
+
 		The OID (name) of this object is indicated by
 		alarmMeasuredVarOid above.
-		
+
 		Example: Value of SP2-MIB::batteryVoltage.batteryVoltageValue
 		'The measured battery voltage'"
 	::= { powerAlarmVars 6 }
@@ -797,7 +797,7 @@ alarmTrapCounterVarValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { powerAlarmVars 7 }
 
@@ -805,23 +805,23 @@ alarmTrapTime  OBJECT-TYPE
 	SYNTAX     DateAndTime (SIZE(8..11))
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Time stemp of trap"
 	::= { powerAlarmVars 8 }
 
--- 
+--
 
 alarmPowerSystemTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the power system."
 	::= { powerSystemTraps 1 }
 
@@ -835,16 +835,16 @@ alarmPowerSystemTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmBatteryTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the battery subsystem."
 	::= { powerSystemTraps 2 }
 
@@ -858,16 +858,16 @@ alarmBatteryTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmLoadGroupTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Load subsystem."
 	::= { powerSystemTraps 3 }
 
@@ -881,16 +881,16 @@ alarmLoadGroupTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmMainsTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Mains subsystem."
 	::= { powerSystemTraps 4 }
 
@@ -904,16 +904,16 @@ alarmMainsTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmRectifierTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Rectifier subsystem."
 	::= { powerSystemTraps 5 }
 
@@ -927,16 +927,16 @@ alarmRectifierTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmControlSystemTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Control-system subsystem."
 	::= { powerSystemTraps 6 }
 
@@ -950,16 +950,16 @@ alarmControlSystemTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmDcDcTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the DCDC converter subsystem."
 	::= { powerSystemTraps 7 }
 
@@ -973,16 +973,16 @@ alarmDcDcTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmInputsTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Inputs subsystem."
 	::= { powerSystemTraps 8 }
 
@@ -996,16 +996,16 @@ alarmInputsTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmOutputsTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Outputs subsystem."
 	::= { powerSystemTraps 9 }
 
@@ -1019,16 +1019,16 @@ alarmOutputsTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmGeneratorTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Generator subsystem."
 	::= { powerSystemTraps 10 }
 
@@ -1042,37 +1042,37 @@ alarmGeneratorTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmSolarChargerTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the SolarCharger subsystem."
 	::= { powerSystemTraps 11 }
 
 alarmWindChargerTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the WindCharger subsystem."
 	::= { powerSystemTraps 12 }
 
 infoHeartBeatTrap  NOTIFICATION-TYPE
 	OBJECTS { alarmSubsysSourceDescr }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"When enabled, this trap will be transmitted at regular inervals. This trap is not
 		intended to be an alarm but more like some information that the system is alive and
 		the link is up."
@@ -1088,16 +1088,16 @@ infoHeartBeatTrap  NOTIFICATION-TYPE
 -- Measured value
 
 alarmInverterTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Inverter subsystem."
 	::= { powerSystemTraps 14 }
 
@@ -1112,7 +1112,7 @@ alarmInverterTrap  NOTIFICATION-TYPE
 
 alarmGridInverterTrapObsolete  NOTIFICATION-TYPE
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Grid Inverter subsystem."
 	::= { powerSystemTraps 15 }
 
@@ -1126,41 +1126,41 @@ alarmGridInverterTrapObsolete  NOTIFICATION-TYPE
 -- Measured value
 
 alarmRectiverterTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the Rectiverter subsystem."
 	::= { powerSystemTraps 16 }
 
 infoBatteryTestTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOnOff, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOnOff,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
-		"This Trap is sent when battery test is performed in the power system: 
+	DESCRIPTION
+		"This Trap is sent when battery test is performed in the power system:
 		"
 	::= { powerSystemTraps 17 }
 
 alarmFuelCellTrap  NOTIFICATION-TYPE
-	OBJECTS { alarmSubsysSourceDescr, 
-		alarmSubsysStatusOid, 
-		alarmSubsysStatusValue, 
-		alarmSubsysStatusOnOff, 
-		alarmMeasuredVarOid, 
-		alarmMeasuredVarValue, 
-		alarmTrapCounterVarValue, 
+	OBJECTS { alarmSubsysSourceDescr,
+		alarmSubsysStatusOid,
+		alarmSubsysStatusValue,
+		alarmSubsysStatusOnOff,
+		alarmMeasuredVarOid,
+		alarmMeasuredVarValue,
+		alarmTrapCounterVarValue,
 		alarmTrapTime }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This Trap is sent when an alarm condition occurs in the fuel cell subsystem."
 	::= { powerSystemTraps 18 }
 
@@ -1189,7 +1189,7 @@ powerSystemStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A status value showing the overall condition of the power system."
 	::= { powerSystem 1 }
 
@@ -1203,7 +1203,7 @@ powerSystemType  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A value showing the type of the power system, which is named after the main controller."
 	::= { powerSystem 2 }
 
@@ -1219,7 +1219,7 @@ powerSystemMode  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A summary status showing if the system is in test, boost, float, equalize, emergency or start-up delay mode
 		"
 	::= { powerSystem 3 }
@@ -1228,7 +1228,7 @@ powerSystemCompany  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Copmany name (as stored in the Control Unit)."
 	::= { powerSystem 4 }
 
@@ -1236,7 +1236,7 @@ powerSystemSite  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The system/site Location details (as stored in the Control Unit)."
 	::= { powerSystem 5 }
 
@@ -1244,7 +1244,7 @@ powerSystemModel  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The model/part number of the power system (as stored in the Control Unit)."
 	::= { powerSystem 6 }
 
@@ -1252,7 +1252,7 @@ powerSystemSerialNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The serial number for the complete system."
 	::= { powerSystem 7 }
 
@@ -1260,7 +1260,7 @@ powerSystemInstallDate  OBJECT-TYPE
 	SYNTAX     DateAndTime
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The system's Installation date (as stored in the Control Unit)."
 	::= { powerSystem 8 }
 
@@ -1268,7 +1268,7 @@ powerSystemNominalVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The nominal voltage rating. 12V/24V/48V/60V/110V/220V/380V etc. systems."
 	::= { powerSystem 9 }
 
@@ -1276,12 +1276,12 @@ powerSystemLongitude  OBJECT-TYPE
 	SYNTAX     Integer32 (-180..180)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A part of the systems global positioning data. The range +-180degrees
-		Longitude lines are imaginary lines running from the north pole to the south pole. 
-		Longitudes are usually (WGS84) referenced from Greenwich, England where it has 
+		Longitude lines are imaginary lines running from the north pole to the south pole.
+		Longitudes are usually (WGS84) referenced from Greenwich, England where it has
 		been established as Zero Degrees longitude. Latitude and Longitude together with
-		the Elevation can be used for automagically placing system icons on 
+		the Elevation can be used for automagically placing system icons on
 		NMS/Sitemonitors system that support this.  "
 	::= { powerSystem 10 }
 
@@ -1289,13 +1289,13 @@ powerSystemLongitudeDecimal  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"The decimal part of dcSystemLatitude contains up to 7digits. This number is 
-		in 1/1000000 degree fractions or 0,0000001 degree. A part of the systems global 
+	DESCRIPTION
+		"The decimal part of dcSystemLatitude contains up to 7digits. This number is
+		in 1/1000000 degree fractions or 0,0000001 degree. A part of the systems global
 		positioning data. Longitude lines are imaginary lines running from the north pole to
-		the south pole.  Longitudes are usually (WGS84) referenced from Greenwich, England where it has 
+		the south pole.  Longitudes are usually (WGS84) referenced from Greenwich, England where it has
 		been established as Zero Degrees longitude. Latitude and Longitude together with
-		the Elevation can be used for automagically placing system icons on 
+		the Elevation can be used for automagically placing system icons on
 		NMS/Sitemonitors system that support this.  "
 	::= { powerSystem 11 }
 
@@ -1303,12 +1303,12 @@ powerSystemLatitude  OBJECT-TYPE
 	SYNTAX     Integer32 (-90..90)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"A part of the systems global positioning data. The latitude gives the location of a place 
-		on Earth (or other planetary body) north or south of the equator. Lines of Latitude has 
-		a range of  +-90 degrees and are the imaginary horizontal lines shown running 
+	DESCRIPTION
+		"A part of the systems global positioning data. The latitude gives the location of a place
+		on Earth (or other planetary body) north or south of the equator. Lines of Latitude has
+		a range of  +-90 degrees and are the imaginary horizontal lines shown running
 		east-to-west (or west to east).  Latitude and Longitude together with
-		the Elevation can be used for automagically placing system icons on 
+		the Elevation can be used for automagically placing system icons on
 		NMS/Sitemonitors system that support this. "
 	::= { powerSystem 12 }
 
@@ -1316,22 +1316,22 @@ powerSystemLatitudeDecimal  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"The decimal part of dcSystemLatitude contains up to 7digits. This number is 
-		in 1/1000000 degree fractions or 0,0000001 degree. A part of the systems global 
+	DESCRIPTION
+		"The decimal part of dcSystemLatitude contains up to 7digits. This number is
+		in 1/1000000 degree fractions or 0,0000001 degree. A part of the systems global
 		positioning data.
-		Lines of Latitude has a range of  +-90 degrees and are the imaginary horizontal 
+		Lines of Latitude has a range of  +-90 degrees and are the imaginary horizontal
 		lines shown running east-to-west (or west to east).  Latitude and Longitude together with
-		the Elevation can be used for automagically placing system icons on 
-		NMS/Sitemonitors system that support this. 
-		
-		
+		the Elevation can be used for automagically placing system icons on
+		NMS/Sitemonitors system that support this.
+
+
 		Longitude lines are imaginary lines running from the north pole to
 		the south pole.
-		 
-		Longitudes are usually (WGS84) referenced from Greenwich, England where it has 
+
+		Longitudes are usually (WGS84) referenced from Greenwich, England where it has
 		been established as Zero Degrees longitude. Latitude and Longitude together with
-		the Elevation can be used for automagically placing system icons on 
+		the Elevation can be used for automagically placing system icons on
 		NMS/Sitemonitors system that support this.  "
 	::= { powerSystem 13 }
 
@@ -1339,7 +1339,7 @@ powerSystemElevation  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A part of the systems global positioning data. This is the sites height above sealevel in Meters.
 		The  Elevation together with Latituse and Longitude is used for automagically placing
 		system icons on NMS/Sitemonitors system that support this."
@@ -1352,7 +1352,7 @@ powerSystemCurrentDecimalSetting  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A global flag telling if the current values in the system is Amperes or DeciAmpres"
 	::= { powerSystem 15 }
 
@@ -1363,7 +1363,7 @@ powerSystemTemperatureScale  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A flag telling if the temperatures values in the system is of Celcius or Fahrenheit type"
 	::= { powerSystem 16 }
 
@@ -1374,7 +1374,7 @@ powerSystemCapacityScale  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A flag telling if the system's battery capacity value is a percentage
 		of a fully charged battery, or in AmpereHours"
 	::= { powerSystem 17 }
@@ -1391,7 +1391,7 @@ powerSystemEnergySource  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Show the energy source that currently powering the system."
 	::= { powerSystem 18 }
 
@@ -1420,7 +1420,7 @@ mainsStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of mains/AC feed subsystem."
 	::= { mains 1 }
 
@@ -1449,7 +1449,7 @@ mainsMainsFailureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed phases is higher than the defined alarm level."
 	::= { mainsMainsFailure 1 }
 
@@ -1457,7 +1457,7 @@ mainsMainsFailureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains phase failure monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMainsFailure 2 }
@@ -1466,9 +1466,9 @@ mainsMainsFailureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainsMainsFailure 3 }
@@ -1480,7 +1480,7 @@ mainsMainsFailureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMainsFailure 4 }
 
@@ -1488,7 +1488,7 @@ mainsMainsFailureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed phases."
 	::= { mainsMainsFailure 5 }
 
@@ -1496,7 +1496,7 @@ mainsMainsFailureMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { mainsMainsFailure 6 }
 
@@ -1504,7 +1504,7 @@ mainsMainsFailureMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { mainsMainsFailure 7 }
 
@@ -1512,7 +1512,7 @@ mainsNumberOfPhases  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value showing the number of phases of the mains subsystem."
 	::= { mains 3 }
 
@@ -1520,7 +1520,7 @@ mainsVoltageTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains voltage monitor"
 	::= { mains 4 }
 
@@ -1528,7 +1528,7 @@ mainsVoltageEntry  OBJECT-TYPE
 	SYNTAX 	MainsVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsVoltageIndex }
 	::= { mainsVoltageTable 1 }
@@ -1560,7 +1560,7 @@ mainsVoltageIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..12)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..12  of mainsVoltageTable"
 	::= { mainsVoltageEntry 1 }
 
@@ -1589,7 +1589,7 @@ mainsVoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains voltage."
 	::= { mainsVoltageEntry 2 }
 
@@ -1597,7 +1597,7 @@ mainsVoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains voltage monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { mainsVoltageEntry 3 }
@@ -1606,9 +1606,9 @@ mainsVoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsVoltageEntry 4 }
@@ -1620,7 +1620,7 @@ mainsVoltageAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsVoltageEntry 5 }
 
@@ -1628,7 +1628,7 @@ mainsVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains voltage."
 	::= { mainsVoltageEntry 6 }
 
@@ -1636,7 +1636,7 @@ mainsVoltageMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsVoltageEntry 7 }
 
@@ -1644,7 +1644,7 @@ mainsVoltageMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsVoltageEntry 8 }
 
@@ -1652,7 +1652,7 @@ mainsVoltageMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { mainsVoltageEntry 9 }
 
@@ -1660,7 +1660,7 @@ mainsVoltageMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { mainsVoltageEntry 10 }
 
@@ -1668,7 +1668,7 @@ mainsMonitorsNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (0..14)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of AC Mains Monitor CAN Nodes installed in the system."
 	::= { mainsMonitors 1 }
 
@@ -1676,7 +1676,7 @@ mainsMonitorsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the number of voltage, current and frequency measurements in each AC Mains Monitor"
 	::= { mainsMonitors 2 }
 
@@ -1684,7 +1684,7 @@ mainsMonitorsEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsMonitorIndex }
 	::= { mainsMonitorsTable 1 }
@@ -1704,7 +1704,7 @@ mainsMonitorIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of mainsMonitorsTable
 		The size of the table is defined by the system  "
 	::= { mainsMonitorsEntry 1 }
@@ -1713,7 +1713,7 @@ mainsMonitorNumberOfVoltages  OBJECT-TYPE
 	SYNTAX     Integer32 (0..3)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of voltage measurements in the AC Mains Monitor"
 	::= { mainsMonitorsEntry 2 }
 
@@ -1721,7 +1721,7 @@ mainsMonitorNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32 (0..3)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of current measurements in the AC Mains Monitor"
 	::= { mainsMonitorsEntry 3 }
 
@@ -1729,7 +1729,7 @@ mainsMonitorNumberOfFrequencies  OBJECT-TYPE
 	SYNTAX     Integer32 (0..3)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of frequency measurements in the AC Mains Monitor"
 	::= { mainsMonitorsEntry 4 }
 
@@ -1737,7 +1737,7 @@ mainsMonitorVoltageTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains voltage in AC Mains Monitor"
 	::= { mainsMonitors 3 }
 
@@ -1745,9 +1745,9 @@ mainsMonitorVoltageEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorPhaseIndex }
 	::= { mainsMonitorVoltageTable 1 }
 
@@ -1778,7 +1778,7 @@ mainsMonitorPhaseIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..3)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..3  of mainsMonitorVolatgeTable"
 	::= { mainsMonitorVoltageEntry 1 }
 
@@ -1807,7 +1807,7 @@ mainsMonitorVoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains voltage in AC Mains Monitor."
 	::= { mainsMonitorVoltageEntry 2 }
 
@@ -1815,7 +1815,7 @@ mainsMonitorVoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains voltage in AC Mains Monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorVoltageEntry 3 }
@@ -1824,9 +1824,9 @@ mainsMonitorVoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorVoltageEntry 4 }
@@ -1838,7 +1838,7 @@ mainsMonitorVoltageAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorVoltageEntry 5 }
 
@@ -1846,7 +1846,7 @@ mainsMonitorVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains voltage in AC Mains Monitor."
 	::= { mainsMonitorVoltageEntry 6 }
 
@@ -1854,7 +1854,7 @@ mainsMonitorVoltageMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorVoltageEntry 7 }
 
@@ -1862,7 +1862,7 @@ mainsMonitorVoltageMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorVoltageEntry 8 }
 
@@ -1870,7 +1870,7 @@ mainsMonitorVoltageMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { mainsMonitorVoltageEntry 9 }
 
@@ -1878,7 +1878,7 @@ mainsMonitorVoltageMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { mainsMonitorVoltageEntry 10 }
 
@@ -1886,7 +1886,7 @@ mainsMonitorCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains current in AC Mains Monitor"
 	::= { mainsMonitors 4 }
 
@@ -1894,9 +1894,9 @@ mainsMonitorCurrentEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorPhaseIndex }
 	::= { mainsMonitorCurrentTable 1 }
 
@@ -1942,7 +1942,7 @@ mainsMonitorCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains current in AC Mains Monitor."
 	::= { mainsMonitorCurrentEntry 1 }
 
@@ -1950,7 +1950,7 @@ mainsMonitorCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains current in AC Mains Monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorCurrentEntry 2 }
@@ -1959,9 +1959,9 @@ mainsMonitorCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorCurrentEntry 3 }
@@ -1973,7 +1973,7 @@ mainsMonitorCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorCurrentEntry 4 }
 
@@ -1981,7 +1981,7 @@ mainsMonitorCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains current in AC Mains Monitor."
 	::= { mainsMonitorCurrentEntry 5 }
 
@@ -1989,7 +1989,7 @@ mainsMonitorCurrentMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorCurrentEntry 6 }
 
@@ -1997,7 +1997,7 @@ mainsMonitorCurrentMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorCurrentEntry 7 }
 
@@ -2005,7 +2005,7 @@ mainsMonitorFrequencyTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorFrequencyEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains frequency in AC Mains Monitor"
 	::= { mainsMonitors 5 }
 
@@ -2013,7 +2013,7 @@ mainsMonitorFrequencyEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorFrequencyEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsMonitorIndex }
 	::= { mainsMonitorFrequencyTable 1 }
@@ -2064,7 +2064,7 @@ mainsMonitorFrequencyStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains frequency in AC Mains Monitor."
 	::= { mainsMonitorFrequencyEntry 1 }
 
@@ -2072,9 +2072,9 @@ mainsMonitorFrequencyDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains frequency in AC Mains Monitor. This is stored in the system
-		 controller 
+		 controller
 		and can be changed by the user.  "
 	::= { mainsMonitorFrequencyEntry 2 }
 
@@ -2082,9 +2082,9 @@ mainsMonitorFrequencyTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorFrequencyEntry 3 }
@@ -2096,7 +2096,7 @@ mainsMonitorFrequencyAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorFrequencyEntry 4 }
 
@@ -2104,7 +2104,7 @@ mainsMonitorFrequencyValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains frequency in AC Mains Monitor."
 	::= { mainsMonitorFrequencyEntry 5 }
 
@@ -2112,7 +2112,7 @@ mainsMonitorFrequencyMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorFrequencyEntry 6 }
 
@@ -2120,7 +2120,7 @@ mainsMonitorFrequencyMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorFrequencyEntry 7 }
 
@@ -2128,7 +2128,7 @@ mainsMonitorFrequencyMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { mainsMonitorFrequencyEntry 8 }
 
@@ -2136,7 +2136,7 @@ mainsMonitorFrequencyMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { mainsMonitorFrequencyEntry 9 }
 
@@ -2144,7 +2144,7 @@ mainsMonitorEnergyLogAccumulatedTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the accumulated energy consumption measured in AC Mains Monitor"
 	::= { mainsMonitors 6 }
 
@@ -2152,7 +2152,7 @@ mainsMonitorEnergyLogAccumulatedEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsMonitorIndex }
 	::= { mainsMonitorEnergyLogAccumulatedTable 1 }
@@ -2166,7 +2166,7 @@ mainsMonitorEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The accumulated energy consumption value"
 	::= { mainsMonitorEnergyLogAccumulatedEntry 1 }
 
@@ -2174,7 +2174,7 @@ mainsMonitorEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in hourly energy log"
 	::= { mainsMonitors 7 }
 
@@ -2182,7 +2182,7 @@ mainsMonitorEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every hour in AC Mains Monitor."
 	::= { mainsMonitors 8 }
 
@@ -2190,9 +2190,9 @@ mainsMonitorEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorEnergyLogLastHoursIndex }
 	::= { mainsMonitorEnergyLogLastHoursTable 1 }
 
@@ -2207,7 +2207,7 @@ mainsMonitorEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsMonitorEnergyLogLastHoursTable"
 	::= { mainsMonitorEnergyLogLastHoursEntry 1 }
 
@@ -2215,7 +2215,7 @@ mainsMonitorEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every hour in AC Mains Monitor."
 	::= { mainsMonitorEnergyLogLastHoursEntry 2 }
 
@@ -2223,7 +2223,7 @@ mainsMonitorEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily energy log"
 	::= { mainsMonitors 9 }
 
@@ -2231,7 +2231,7 @@ mainsMonitorEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every day in AC Mains Monitor."
 	::= { mainsMonitors 10 }
 
@@ -2239,9 +2239,9 @@ mainsMonitorEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorEnergyLogLastDaysIndex }
 	::= { mainsMonitorEnergyLogLastDaysTable 1 }
 
@@ -2256,7 +2256,7 @@ mainsMonitorEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsMonitorEnergyLogLastDaysTable"
 	::= { mainsMonitorEnergyLogLastDaysEntry 1 }
 
@@ -2264,7 +2264,7 @@ mainsMonitorEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every day in AC Mains Monitor."
 	::= { mainsMonitorEnergyLogLastDaysEntry 2 }
 
@@ -2272,7 +2272,7 @@ mainsMonitorEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly energy log"
 	::= { mainsMonitors 11 }
 
@@ -2280,7 +2280,7 @@ mainsMonitorEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every week in AC Mains Monitor."
 	::= { mainsMonitors 12 }
 
@@ -2288,9 +2288,9 @@ mainsMonitorEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorEnergyLogLastWeeksIndex }
 	::= { mainsMonitorEnergyLogLastWeeksTable 1 }
 
@@ -2305,7 +2305,7 @@ mainsMonitorEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsMonitorEnergyLogLastWeeksTable"
 	::= { mainsMonitorEnergyLogLastWeeksEntry 1 }
 
@@ -2313,7 +2313,7 @@ mainsMonitorEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every week in AC Mains Monitor."
 	::= { mainsMonitorEnergyLogLastWeeksEntry 2 }
 
@@ -2321,7 +2321,7 @@ mainsMonitorActivePowerTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorActivePowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains active power in AC Mains Monitor"
 	::= { mainsMonitors 13 }
 
@@ -2329,9 +2329,9 @@ mainsMonitorActivePowerEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorActivePowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorPhaseIndex }
 	::= { mainsMonitorActivePowerTable 1 }
 
@@ -2377,7 +2377,7 @@ mainsMonitorActivePowerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains active power in AC Mains Monitor."
 	::= { mainsMonitorActivePowerEntry 1 }
 
@@ -2385,7 +2385,7 @@ mainsMonitorActivePowerDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains active power in AC Mains Monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorActivePowerEntry 2 }
@@ -2394,9 +2394,9 @@ mainsMonitorActivePowerTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorActivePowerEntry 3 }
@@ -2408,7 +2408,7 @@ mainsMonitorActivePowerAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorActivePowerEntry 4 }
 
@@ -2416,7 +2416,7 @@ mainsMonitorActivePowerValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains active power in AC Mains Monitor."
 	::= { mainsMonitorActivePowerEntry 5 }
 
@@ -2424,7 +2424,7 @@ mainsMonitorActivePowerMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorActivePowerEntry 6 }
 
@@ -2432,7 +2432,7 @@ mainsMonitorActivePowerMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorActivePowerEntry 7 }
 
@@ -2440,7 +2440,7 @@ mainsMonitorReactivePowerTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorReactivePowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains reactive power in AC Mains Monitor"
 	::= { mainsMonitors 14 }
 
@@ -2448,9 +2448,9 @@ mainsMonitorReactivePowerEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorReactivePowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorPhaseIndex }
 	::= { mainsMonitorReactivePowerTable 1 }
 
@@ -2496,7 +2496,7 @@ mainsMonitorReactivePowerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains reactive power in AC Mains Monitor."
 	::= { mainsMonitorReactivePowerEntry 1 }
 
@@ -2504,7 +2504,7 @@ mainsMonitorReactivePowerDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains reactive power in AC Mains Monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorReactivePowerEntry 2 }
@@ -2513,9 +2513,9 @@ mainsMonitorReactivePowerTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorReactivePowerEntry 3 }
@@ -2527,7 +2527,7 @@ mainsMonitorReactivePowerAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorReactivePowerEntry 4 }
 
@@ -2535,7 +2535,7 @@ mainsMonitorReactivePowerValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains reactive power in AC Mains Monitor."
 	::= { mainsMonitorReactivePowerEntry 5 }
 
@@ -2543,7 +2543,7 @@ mainsMonitorReactivePowerMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorReactivePowerEntry 6 }
 
@@ -2551,7 +2551,7 @@ mainsMonitorReactivePowerMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorReactivePowerEntry 7 }
 
@@ -2559,7 +2559,7 @@ mainsMonitorApparentPowerTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsMonitorApparentPowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains apparent power in AC Mains Monitor"
 	::= { mainsMonitors 15 }
 
@@ -2567,9 +2567,9 @@ mainsMonitorApparentPowerEntry  OBJECT-TYPE
 	SYNTAX 	MainsMonitorApparentPowerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsMonitorIndex, 
+	INDEX { mainsMonitorIndex,
 		mainsMonitorPhaseIndex }
 	::= { mainsMonitorApparentPowerTable 1 }
 
@@ -2615,7 +2615,7 @@ mainsMonitorApparentPowerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains apparent power in AC Mains Monitor."
 	::= { mainsMonitorApparentPowerEntry 1 }
 
@@ -2623,7 +2623,7 @@ mainsMonitorApparentPowerDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains apparent power in AC Mains Monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorApparentPowerEntry 2 }
@@ -2632,9 +2632,9 @@ mainsMonitorApparentPowerTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsMonitorApparentPowerEntry 3 }
@@ -2646,7 +2646,7 @@ mainsMonitorApparentPowerAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorApparentPowerEntry 4 }
 
@@ -2654,7 +2654,7 @@ mainsMonitorApparentPowerValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains apparent power in AC Mains Monitor."
 	::= { mainsMonitorApparentPowerEntry 5 }
 
@@ -2662,7 +2662,7 @@ mainsMonitorApparentPowerMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsMonitorApparentPowerEntry 6 }
 
@@ -2670,7 +2670,7 @@ mainsMonitorApparentPowerMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsMonitorApparentPowerEntry 7 }
 
@@ -2678,7 +2678,7 @@ mainsOutageTotal  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total mains outage time measured in hours. Note that the value of this OID
 		does not changed when the 'mainsLogMode' OID is set to 'runningTime'. The total running
 		time is available at OID 1.3.6.1.4.1.12148.10.3.15."
@@ -2688,7 +2688,7 @@ mainsOutageLogDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily mains outage/running time log."
 	::= { mainsOutageLog 2 }
 
@@ -2696,7 +2696,7 @@ mainsOutageLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsOutageLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily mains outage or running time log depending on the log mode."
 	::= { mainsOutageLog 3 }
 
@@ -2704,7 +2704,7 @@ mainsOutageLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	MainsOutageLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsOutageLogDaysIndex }
 	::= { mainsOutageLogDaysTable 1 }
@@ -2720,7 +2720,7 @@ mainsOutageLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsOutageLogDaysTable"
 	::= { mainsOutageLogDaysEntry 1 }
 
@@ -2728,7 +2728,7 @@ mainsOutageLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage or running time value in minutes, logged every day."
 	::= { mainsOutageLogDaysEntry 2 }
 
@@ -2736,7 +2736,7 @@ mainsOutageLogWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly mains outage/running time log."
 	::= { mainsOutageLog 4 }
 
@@ -2744,7 +2744,7 @@ mainsOutageLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsOutageLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly mains outage or running time log depending on the log mode."
 	::= { mainsOutageLog 5 }
 
@@ -2752,7 +2752,7 @@ mainsOutageLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	MainsOutageLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsOutageLogWeeksIndex }
 	::= { mainsOutageLogWeeksTable 1 }
@@ -2768,7 +2768,7 @@ mainsOutageLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsOutageLogWeeksTable"
 	::= { mainsOutageLogWeeksEntry 1 }
 
@@ -2776,7 +2776,7 @@ mainsOutageLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage or running time value in hours, logged every week."
 	::= { mainsOutageLogWeeksEntry 2 }
 
@@ -2784,7 +2784,7 @@ mainsOutageLogMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly mains outage/running time log."
 	::= { mainsOutageLog 6 }
 
@@ -2792,7 +2792,7 @@ mainsOutageLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsOutageLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly mains outage or running time log depending on the log mode."
 	::= { mainsOutageLog 7 }
 
@@ -2800,7 +2800,7 @@ mainsOutageLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	MainsOutageLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsOutageLogMonthsIndex }
 	::= { mainsOutageLogMonthsTable 1 }
@@ -2816,7 +2816,7 @@ mainsOutageLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsOutageLogMonthsTable"
 	::= { mainsOutageLogMonthsEntry 1 }
 
@@ -2824,7 +2824,7 @@ mainsOutageLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage or running time value in hours, logged every month."
 	::= { mainsOutageLogMonthsEntry 2 }
 
@@ -2835,7 +2835,7 @@ mainsLogMode  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value determines if the mains outage time or running time should be logged."
 	::= { mainsOutageLog 8 }
 
@@ -2843,7 +2843,7 @@ mainsNumberOfGroups  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value showing the number of groups of the mains subsystem."
 	::= { mains 7 }
 
@@ -2851,7 +2851,7 @@ mainsGroupsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the status of mains group and number of phases in each group."
 	::= { mains 8 }
 
@@ -2859,7 +2859,7 @@ mainsGroupsEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsGroupIndex }
 	::= { mainsGroupsTable 1 }
@@ -2877,7 +2877,7 @@ mainsGroupIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..10  of mainsGroupTable"
 	::= { mainsGroupsEntry 1 }
 
@@ -2906,7 +2906,7 @@ mainsGroupStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of mains group."
 	::= { mainsGroupsEntry 2 }
 
@@ -2914,7 +2914,7 @@ mainsGroupNumberOfPhases  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value showing the number of phases of the mains group subsystem."
 	::= { mainsGroupsEntry 3 }
 
@@ -2922,7 +2922,7 @@ mainsGroupMainsFailureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupMainsFailureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains failure monitor of mains group"
 	::= { mains 9 }
 
@@ -2930,7 +2930,7 @@ mainsGroupMainsFailureEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupMainsFailureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsGroupIndex }
 	::= { mainsGroupMainsFailureTable 1 }
@@ -2977,7 +2977,7 @@ mainsGroupMainsFailureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed phases is higher than the defined alarm level for the mains group"
 	::= { mainsGroupMainsFailureEntry 1 }
 
@@ -2985,7 +2985,7 @@ mainsGroupMainsFailureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains group phase failure monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsGroupMainsFailureEntry 2 }
@@ -2994,9 +2994,9 @@ mainsGroupMainsFailureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainsGroupMainsFailureEntry 3 }
@@ -3008,7 +3008,7 @@ mainsGroupMainsFailureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsGroupMainsFailureEntry 4 }
 
@@ -3016,7 +3016,7 @@ mainsGroupMainsFailureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed phases in the mains group."
 	::= { mainsGroupMainsFailureEntry 5 }
 
@@ -3024,7 +3024,7 @@ mainsGroupMainsFailureMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { mainsGroupMainsFailureEntry 6 }
 
@@ -3032,7 +3032,7 @@ mainsGroupMainsFailureMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { mainsGroupMainsFailureEntry 7 }
 
@@ -3040,7 +3040,7 @@ mainsGroupVoltageTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about mains voltage monitors for mains group"
 	::= { mains 10 }
 
@@ -3048,9 +3048,9 @@ mainsGroupVoltageEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsGroupIndex, 
+	INDEX { mainsGroupIndex,
 		mainsGroupVoltageIndex }
 	::= { mainsGroupVoltageTable 1 }
 
@@ -3081,7 +3081,7 @@ mainsGroupVoltageIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..12)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..12  of mainsGroupVoltageTable"
 	::= { mainsGroupVoltageEntry 1 }
 
@@ -3110,7 +3110,7 @@ mainsGroupVoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured mains voltage of the mains group."
 	::= { mainsGroupVoltageEntry 2 }
 
@@ -3118,7 +3118,7 @@ mainsGroupVoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains voltage monitor of the mains group. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { mainsGroupVoltageEntry 3 }
@@ -3127,9 +3127,9 @@ mainsGroupVoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { mainsGroupVoltageEntry 4 }
@@ -3141,7 +3141,7 @@ mainsGroupVoltageAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsGroupVoltageEntry 5 }
 
@@ -3149,7 +3149,7 @@ mainsGroupVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured mains voltage in the mains group."
 	::= { mainsGroupVoltageEntry 6 }
 
@@ -3157,7 +3157,7 @@ mainsGroupVoltageMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainsGroupVoltageEntry 7 }
 
@@ -3165,7 +3165,7 @@ mainsGroupVoltageMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainsGroupVoltageEntry 8 }
 
@@ -3173,7 +3173,7 @@ mainsGroupVoltageMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { mainsGroupVoltageEntry 9 }
 
@@ -3181,7 +3181,7 @@ mainsGroupVoltageMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { mainsGroupVoltageEntry 10 }
 
@@ -3189,7 +3189,7 @@ mainsGroupOutageLogTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupOutageLogEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		" This table contains total mains outage of the mains group and number of entries in each log table."
 	::= { mains 11 }
 
@@ -3197,7 +3197,7 @@ mainsGroupOutageLogEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupOutageLogEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainsGroupIndex }
 	::= { mainsGroupOutageLogTable 1 }
@@ -3217,7 +3217,7 @@ mainsGroupOutageTotal  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total mains outage time measured in hours in the mains group."
 	::= { mainsGroupOutageLogEntry 1 }
 
@@ -3225,7 +3225,7 @@ mainsGroupOutageLogDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily mains outage log."
 	::= { mainsGroupOutageLogEntry 2 }
 
@@ -3233,7 +3233,7 @@ mainsGroupOutageLogWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly mains outage time log."
 	::= { mainsGroupOutageLogEntry 3 }
 
@@ -3241,7 +3241,7 @@ mainsGroupOutageLogMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly mains outage time log."
 	::= { mainsGroupOutageLogEntry 4 }
 
@@ -3249,7 +3249,7 @@ mainsGroupOutageLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupOutageLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily mains outage time log of mains group."
 	::= { mains 12 }
 
@@ -3257,9 +3257,9 @@ mainsGroupOutageLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupOutageLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsGroupIndex, 
+	INDEX { mainsGroupIndex,
 		mainsGroupOutageLogDaysIndex }
 	::= { mainsGroupOutageLogDaysTable 1 }
 
@@ -3274,7 +3274,7 @@ mainsGroupOutageLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsGroupOutageLogDaysTable"
 	::= { mainsGroupOutageLogDaysEntry 1 }
 
@@ -3282,7 +3282,7 @@ mainsGroupOutageLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage time value in minutes of each mains group, logged every day."
 	::= { mainsGroupOutageLogDaysEntry 2 }
 
@@ -3290,7 +3290,7 @@ mainsGroupOutageLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupOutageLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly mains outage time log of mains group."
 	::= { mains 13 }
 
@@ -3298,9 +3298,9 @@ mainsGroupOutageLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupOutageLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsGroupIndex, 
+	INDEX { mainsGroupIndex,
 		mainsGroupOutageLogWeeksIndex }
 	::= { mainsGroupOutageLogWeeksTable 1 }
 
@@ -3315,7 +3315,7 @@ mainsGroupOutageLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsGroupOutageLogWeeksTable"
 	::= { mainsGroupOutageLogWeeksEntry 1 }
 
@@ -3323,7 +3323,7 @@ mainsGroupOutageLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage time value in hours of each mains group, logged every week."
 	::= { mainsGroupOutageLogWeeksEntry 2 }
 
@@ -3331,7 +3331,7 @@ mainsGroupOutageLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainsGroupOutageLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly mains outage time log of mains group."
 	::= { mains 14 }
 
@@ -3339,9 +3339,9 @@ mainsGroupOutageLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	MainsGroupOutageLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainsGroupIndex, 
+	INDEX { mainsGroupIndex,
 		mainsGroupOutageLogMonthsIndex }
 	::= { mainsGroupOutageLogMonthsTable 1 }
 
@@ -3356,7 +3356,7 @@ mainsGroupOutageLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of mainsGroupOutageLogMonthsTable"
 	::= { mainsGroupOutageLogMonthsEntry 1 }
 
@@ -3364,7 +3364,7 @@ mainsGroupOutageLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Mains outage time value in hours of each mains group, logged every month."
 	::= { mainsGroupOutageLogMonthsEntry 2 }
 
@@ -3372,7 +3372,7 @@ mainsRunningHours  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total mains running time measured in hours. The total outage
 		time is available at OID 1.3.6.1.4.1.12148.10.3.6.1"
 	::= { mains 15 }
@@ -3402,7 +3402,7 @@ generatorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of generator subsystem."
 	::= { generator 1 }
 
@@ -3431,7 +3431,7 @@ generatorFailStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of generator failure monitor."
 	::= { generator 2 }
 
@@ -3439,7 +3439,7 @@ generatorActivation  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Indicate if the generator run output signal is activated."
 	::= { generator 3 }
 
@@ -3447,7 +3447,7 @@ generatorDischargeValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the present discharge value in percentage of total capacity."
 	::= { generator 4 }
 
@@ -3455,7 +3455,7 @@ generatorMainsDelay  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Elapsing time of mains failure."
 	::= { generator 5 }
 
@@ -3463,7 +3463,7 @@ generatorChargeTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Elapsing time of charging with generator running."
 	::= { generator 6 }
 
@@ -3474,7 +3474,7 @@ generatorCapacityControlledStartStopEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery charge/discharge level control of starting and stopping of generator "
 	::= { generator 7 }
 
@@ -3482,8 +3482,8 @@ generatorCapacityStartOnDischargeLimit  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"When the generatorCapacityControlled is enabled, the generator is started 
+	DESCRIPTION
+		"When the generatorCapacityControlled is enabled, the generator is started
 		when the remaining battery capacity drops below this limit in percentage of the total capacity."
 	::= { generator 8 }
 
@@ -3491,8 +3491,8 @@ generatorCapacityStopOnChargeLimit  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"When the generatorCapacityControlled is enabled, the generator is stopped 
+	DESCRIPTION
+		"When the generatorCapacityControlled is enabled, the generator is stopped
 		when the remaining battery capacity is greater than this limit in percentage of the total capacity."
 	::= { generator 9 }
 
@@ -3503,7 +3503,7 @@ generatorCurrentLimitControlledStopEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enables the generator to stop when the charge current drops below generatorCurrentLimitControlledStopValue. "
 	::= { generator 10 }
 
@@ -3511,7 +3511,7 @@ generatorCurrentLimitControlledStopValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator stops when the charge current drop drops below this level. "
 	::= { generator 11 }
 
@@ -3522,7 +3522,7 @@ generatorVoltageControlledStartEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable voltage controlled generator activation."
 	::= { generator 12 }
 
@@ -3530,7 +3530,7 @@ generatorVoltageControlStartVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The voltage limit to start generator."
 	::= { generator 13 }
 
@@ -3538,7 +3538,7 @@ generatorVoltageControlStopAfter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A time delay for stopping generator when generator is activated by voltage."
 	::= { generator 14 }
 
@@ -3549,7 +3549,7 @@ generatorDailyRunEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable generator daily run function."
 	::= { generator 15 }
 
@@ -3557,7 +3557,7 @@ generatorDailyRunSetupTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorDailyRunSetupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains configurations of generator daily run."
 	::= { generator 16 }
 
@@ -3565,7 +3565,7 @@ generatorDailyRunSetupEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorDailyRunSetupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorDailyRunDayIndex }
 	::= { generatorDailyRunSetupTable 1 }
@@ -3591,7 +3591,7 @@ generatorDailyRunDayIndex  OBJECT-TYPE
 	}
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..7  of generatorDailyRunSetupTable"
 	::= { generatorDailyRunSetupEntry 1 }
 
@@ -3599,7 +3599,7 @@ generatorDailyRunStartHour  OBJECT-TYPE
 	SYNTAX     Integer32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator daily starting time."
 	::= { generatorDailyRunSetupEntry 2 }
 
@@ -3607,7 +3607,7 @@ generatorDailyRunStopHour  OBJECT-TYPE
 	SYNTAX     Integer32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator daily stopping time."
 	::= { generatorDailyRunSetupEntry 3 }
 
@@ -3618,7 +3618,7 @@ generatorMonthlyRunEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable generator monthly run function."
 	::= { generator 17 }
 
@@ -3626,7 +3626,7 @@ generatorMonthlyRunStartTime  OBJECT-TYPE
 	SYNTAX     Integer32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator monthly run starting time."
 	::= { generator 18 }
 
@@ -3634,7 +3634,7 @@ generatorMonthlyRunStartDayinMonth1  OBJECT-TYPE
 	SYNTAX     Integer32 (1..32)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator monthly run starting day #1."
 	::= { generator 19 }
 
@@ -3642,7 +3642,7 @@ generatorMonthlyRunStartDayinMonth2  OBJECT-TYPE
 	SYNTAX     Integer32 (1..32)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator monthly run starting day #2."
 	::= { generator 20 }
 
@@ -3650,7 +3650,7 @@ generatorTankNumberOfTanks  OBJECT-TYPE
 	SYNTAX     Integer32 (0..2)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fuel tanks."
 	::= { generator 21 }
 
@@ -3658,7 +3658,7 @@ generatorTankTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorTankEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about generator fuel tanks."
 	::= { generator 22 }
 
@@ -3666,7 +3666,7 @@ generatorTankEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorTankEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorTankIndex }
 	::= { generatorTankTable 1 }
@@ -3698,7 +3698,7 @@ generatorTankIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..2)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..2  of generatorTankTable"
 	::= { generatorTankEntry 1 }
 
@@ -3727,7 +3727,7 @@ generatorTankStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured fuel level in tank."
 	::= { generatorTankEntry 2 }
 
@@ -3735,7 +3735,7 @@ generatorTankDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the fuel level monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { generatorTankEntry 3 }
@@ -3744,9 +3744,9 @@ generatorTankTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { generatorTankEntry 4 }
@@ -3758,7 +3758,7 @@ generatorTankEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { generatorTankEntry 5 }
 
@@ -3766,7 +3766,7 @@ generatorTankValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured fuel level."
 	::= { generatorTankEntry 6 }
 
@@ -3774,7 +3774,7 @@ generatorTankMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { generatorTankEntry 7 }
 
@@ -3782,7 +3782,7 @@ generatorTankMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { generatorTankEntry 8 }
 
@@ -3790,7 +3790,7 @@ generatorTankMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { generatorTankEntry 9 }
 
@@ -3798,7 +3798,7 @@ generatorTankMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { generatorTankEntry 10 }
 
@@ -3806,7 +3806,7 @@ generatorEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered through rectifiers from generator."
 	::= { generatorEnergyLog 1 }
 
@@ -3814,7 +3814,7 @@ generatorEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator hourly energy log."
 	::= { generatorEnergyLog 2 }
 
@@ -3822,7 +3822,7 @@ generatorEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of generator."
 	::= { generatorEnergyLog 3 }
 
@@ -3830,7 +3830,7 @@ generatorEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorEnergyLogLastHoursIndex }
 	::= { generatorEnergyLogLastHoursTable 1 }
@@ -3846,7 +3846,7 @@ generatorEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorEnergyLogLastHoursTable"
 	::= { generatorEnergyLogLastHoursEntry 1 }
 
@@ -3854,7 +3854,7 @@ generatorEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { generatorEnergyLogLastHoursEntry 2 }
 
@@ -3862,7 +3862,7 @@ generatorEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator daily energy log."
 	::= { generatorEnergyLog 4 }
 
@@ -3870,7 +3870,7 @@ generatorEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of generator."
 	::= { generatorEnergyLog 5 }
 
@@ -3878,7 +3878,7 @@ generatorEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorEnergyLogLastDaysIndex }
 	::= { generatorEnergyLogLastDaysTable 1 }
@@ -3894,7 +3894,7 @@ generatorEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorEnergyLogLastDaysTable"
 	::= { generatorEnergyLogLastDaysEntry 1 }
 
@@ -3902,7 +3902,7 @@ generatorEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day"
 	::= { generatorEnergyLogLastDaysEntry 2 }
 
@@ -3910,7 +3910,7 @@ generatorEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator weekly energy log."
 	::= { generatorEnergyLog 6 }
 
@@ -3918,7 +3918,7 @@ generatorEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of generator."
 	::= { generatorEnergyLog 7 }
 
@@ -3926,7 +3926,7 @@ generatorEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorEnergyLogLastWeeksIndex }
 	::= { generatorEnergyLogLastWeeksTable 1 }
@@ -3942,7 +3942,7 @@ generatorEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorEnergyLogLastWeeksTable"
 	::= { generatorEnergyLogLastWeeksEntry 1 }
 
@@ -3950,7 +3950,7 @@ generatorEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { generatorEnergyLogLastWeeksEntry 2 }
 
@@ -3958,7 +3958,7 @@ generatorRunHoursTotalHours  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total generator running hours."
 	::= { generatorRunHoursLog 1 }
 
@@ -3966,7 +3966,7 @@ generatorRunHoursLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator daily running hours log."
 	::= { generatorRunHoursLog 2 }
 
@@ -3974,7 +3974,7 @@ generatorRunHoursLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorRunHoursLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generator running time in minutes"
 	::= { generatorRunHoursLog 3 }
 
@@ -3982,7 +3982,7 @@ generatorRunHoursLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorRunHoursLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorRunHoursLogLastDaysIndex }
 	::= { generatorRunHoursLogLastDaysTable 1 }
@@ -3998,7 +3998,7 @@ generatorRunHoursLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorRunHoursLogLastDaysTable"
 	::= { generatorRunHoursLogLastDaysEntry 1 }
 
@@ -4006,7 +4006,7 @@ generatorRunHoursLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator running time in minutes, logged every day."
 	::= { generatorRunHoursLogLastDaysEntry 2 }
 
@@ -4014,7 +4014,7 @@ generatorRunHoursLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator weekly running hours log."
 	::= { generatorRunHoursLog 4 }
 
@@ -4022,7 +4022,7 @@ generatorRunHoursLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorRunHoursLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generator running time in hours"
 	::= { generatorRunHoursLog 5 }
 
@@ -4030,7 +4030,7 @@ generatorRunHoursLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorRunHoursLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorRunHoursLogLastWeeksIndex }
 	::= { generatorRunHoursLogLastWeeksTable 1 }
@@ -4046,7 +4046,7 @@ generatorRunHoursLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorRunHoursLogLastWeeksTable"
 	::= { generatorRunHoursLogLastWeeksEntry 1 }
 
@@ -4054,7 +4054,7 @@ generatorRunHoursLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator running time in hours, logged every week."
 	::= { generatorRunHoursLogLastWeeksEntry 2 }
 
@@ -4062,7 +4062,7 @@ generatorRunHoursLogLastMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator monthly running hours log."
 	::= { generatorRunHoursLog 6 }
 
@@ -4070,7 +4070,7 @@ generatorRunHoursLogLastMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorRunHoursLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generator running time in hours"
 	::= { generatorRunHoursLog 7 }
 
@@ -4078,7 +4078,7 @@ generatorRunHoursLogLastMonthsEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorRunHoursLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorRunHoursLogLastMonthsIndex }
 	::= { generatorRunHoursLogLastMonthsTable 1 }
@@ -4094,7 +4094,7 @@ generatorRunHoursLogLastMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorRunHoursLogLastMonthsTable"
 	::= { generatorRunHoursLogLastMonthsEntry 1 }
 
@@ -4102,7 +4102,7 @@ generatorRunHoursLogLastMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator running time in hours, logged every month."
 	::= { generatorRunHoursLogLastMonthsEntry 2 }
 
@@ -4110,7 +4110,7 @@ generatorFuelConsumptionTotalUsedTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorFuelConsumptionTotalUsedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains total fuel consumption for each tank."
 	::= { generatorFuelConsumptionLog 1 }
 
@@ -4118,7 +4118,7 @@ generatorFuelConsumptionTotalUsedEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorFuelConsumptionTotalUsedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { generatorTankIndex }
 	::= { generatorFuelConsumptionTotalUsedTable 1 }
@@ -4132,7 +4132,7 @@ generatorFuelConsumptionTotalUsed  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Total fuel consumption value."
 	::= { generatorFuelConsumptionTotalUsedEntry 1 }
 
@@ -4140,7 +4140,7 @@ generatorFuelConsumptionLogLastDaysNoOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator daily fuel consumption log."
 	::= { generatorFuelConsumptionLog 2 }
 
@@ -4148,7 +4148,7 @@ generatorFuelConsumptionLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorFuelConsumptionLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains generator daily fuel consumption log."
 	::= { generatorFuelConsumptionLog 3 }
 
@@ -4156,9 +4156,9 @@ generatorFuelConsumptionLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorFuelConsumptionLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { generatorTankIndex, 
+	INDEX { generatorTankIndex,
 		generatorFuelConsumptionLogLastDaysIndex }
 	::= { generatorFuelConsumptionLogLastDaysTable 1 }
 
@@ -4173,7 +4173,7 @@ generatorFuelConsumptionLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorFuelConsumptionLogLastDaysTable"
 	::= { generatorFuelConsumptionLogLastDaysEntry 1 }
 
@@ -4181,7 +4181,7 @@ generatorFuelConsumptionLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator fuel consumption value, logged every day."
 	::= { generatorFuelConsumptionLogLastDaysEntry 2 }
 
@@ -4189,7 +4189,7 @@ generatorFuelConsumptionLogLastWeeksNoOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator weekly fuel consumption log."
 	::= { generatorFuelConsumptionLog 4 }
 
@@ -4197,7 +4197,7 @@ generatorFuelConsumptionLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorFuelConsumptionLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains generator weekly fuel consumption log."
 	::= { generatorFuelConsumptionLog 5 }
 
@@ -4205,9 +4205,9 @@ generatorFuelConsumptionLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorFuelConsumptionLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { generatorTankIndex, 
+	INDEX { generatorTankIndex,
 		generatorFuelConsumptionLogLastWeeksIndex }
 	::= { generatorFuelConsumptionLogLastWeeksTable 1 }
 
@@ -4222,7 +4222,7 @@ generatorFuelConsumptionLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorFuelConsumptionLogLastWeeksTable"
 	::= { generatorFuelConsumptionLogLastWeeksEntry 1 }
 
@@ -4230,7 +4230,7 @@ generatorFuelConsumptionLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator fuel consumption value, logged every week."
 	::= { generatorFuelConsumptionLogLastWeeksEntry 2 }
 
@@ -4238,7 +4238,7 @@ generatorFuelConsumptionLogLastMonthsNoOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in generator hourly fuel consumption log."
 	::= { generatorFuelConsumptionLog 6 }
 
@@ -4246,7 +4246,7 @@ generatorFuelConsumptionLogLastMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GeneratorFuelConsumptionLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains generator hourly fuel consumption log."
 	::= { generatorFuelConsumptionLog 7 }
 
@@ -4254,9 +4254,9 @@ generatorFuelConsumptionLogLastMonthsEntry  OBJECT-TYPE
 	SYNTAX 	GeneratorFuelConsumptionLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { generatorTankIndex, 
+	INDEX { generatorTankIndex,
 		generatorFuelConsumptionLogLastMonthsIndex }
 	::= { generatorFuelConsumptionLogLastMonthsTable 1 }
 
@@ -4271,7 +4271,7 @@ generatorFuelConsumptionLogLastMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of generatorFuelConsumptionLogLastHoursTable"
 	::= { generatorFuelConsumptionLogLastMonthsEntry 1 }
 
@@ -4279,7 +4279,7 @@ generatorFuelConsumptionLogLastMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator fuel consumption value, logged every hour."
 	::= { generatorFuelConsumptionLogLastMonthsEntry 2 }
 
@@ -4287,7 +4287,7 @@ gseGeneratorOilPressure  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Oil pressure in kpa"
 	::= { gseGenerator 1 }
 
@@ -4295,7 +4295,7 @@ gseGeneratorCoolantTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Coolant temperature"
 	::= { gseGenerator 2 }
 
@@ -4303,7 +4303,7 @@ gseGeneratorFuelLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Fuel level in percentage"
 	::= { gseGenerator 3 }
 
@@ -4311,7 +4311,7 @@ gseGeneratorEngineBatteryVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Engine Battery voltage"
 	::= { gseGenerator 4 }
 
@@ -4319,7 +4319,7 @@ gseGeneratorEngineSpeed  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Engine speed in RPM"
 	::= { gseGenerator 5 }
 
@@ -4327,7 +4327,7 @@ gseGeneratorFrequency  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator frequency in Hz"
 	::= { gseGenerator 6 }
 
@@ -4335,7 +4335,7 @@ gseGeneratorEngineRunTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Engine run time in seconds"
 	::= { gseGenerator 7 }
 
@@ -4351,7 +4351,7 @@ gseGeneratorMode  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generator Auto/manual mode"
 	::= { gseGenerator 8 }
 
@@ -4376,7 +4376,7 @@ gseGeneratorRunning  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generator operating state"
 	::= { gseGenerator 9 }
 
@@ -4398,7 +4398,7 @@ gseGeneratorHighTemperature  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 10 }
 
@@ -4420,7 +4420,7 @@ gseGeneratorLowOilPressure  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 11 }
 
@@ -4442,7 +4442,7 @@ gseGeneratorFuelProbeFail  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 12 }
 
@@ -4464,7 +4464,7 @@ gseGeneratorFuelTankLevelLow  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 13 }
 
@@ -4486,7 +4486,7 @@ gseGeneratorFuelTankLoss  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 14 }
 
@@ -4508,7 +4508,7 @@ gseGeneratorRMSCommunicationFailure  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 15 }
 
@@ -4530,7 +4530,7 @@ gseGeneratorOtherAlarms  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { gseGenerator 16 }
 
@@ -4559,7 +4559,7 @@ generatorFailureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed phases is higher than the defined alarm level."
 	::= { generatorFailure 1 }
 
@@ -4567,7 +4567,7 @@ generatorFailureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the generator failure monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { generatorFailure 2 }
@@ -4576,9 +4576,9 @@ generatorFailureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { generatorFailure 3 }
@@ -4590,7 +4590,7 @@ generatorFailureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { generatorFailure 4 }
 
@@ -4598,7 +4598,7 @@ generatorFailureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the monitor."
 	::= { generatorFailure 5 }
 
@@ -4606,7 +4606,7 @@ generatorBattVoltageControlledStopLimit1  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop limit 1. Scale = 0.01"
 	::= { generatorBattVoltageControlledStop 1 }
 
@@ -4614,7 +4614,7 @@ generatorBattVoltageControlledStopStartTime1  OBJECT-TYPE
 	SYNTAX     Unsigned32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop start time 1"
 	::= { generatorBattVoltageControlledStop 2 }
 
@@ -4622,7 +4622,7 @@ generatorBattVoltageControlledStopEndTime1  OBJECT-TYPE
 	SYNTAX     Unsigned32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop end time 1"
 	::= { generatorBattVoltageControlledStop 3 }
 
@@ -4630,7 +4630,7 @@ generatorBattVoltageControlledStopLimit2  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop limit 1. Scale = 0.01"
 	::= { generatorBattVoltageControlledStop 4 }
 
@@ -4638,7 +4638,7 @@ generatorBattVoltageControlledStopStartTime2  OBJECT-TYPE
 	SYNTAX     Unsigned32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop start time 2"
 	::= { generatorBattVoltageControlledStop 5 }
 
@@ -4646,7 +4646,7 @@ generatorBattVoltageControlledStopEndTime2  OBJECT-TYPE
 	SYNTAX     Unsigned32 (0..23)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage controlled generator stop end time 2"
 	::= { generatorBattVoltageControlledStop 6 }
 
@@ -4675,7 +4675,7 @@ rectifiersStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of rectifier subsystem."
 	::= { rectifiers 1 }
 
@@ -4704,7 +4704,7 @@ rectifiersCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectifiersCurrent 1 }
 
@@ -4712,7 +4712,7 @@ rectifiersCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifiersCurrent 2 }
@@ -4721,9 +4721,9 @@ rectifiersCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifiersCurrent 3 }
@@ -4735,7 +4735,7 @@ rectifiersCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifiersCurrent 4 }
 
@@ -4743,7 +4743,7 @@ rectifiersCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectifiersCurrent 5 }
 
@@ -4751,7 +4751,7 @@ rectifiersCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifiersCurrent 6 }
 
@@ -4759,7 +4759,7 @@ rectifiersCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifiersCurrent 7 }
 
@@ -4788,7 +4788,7 @@ rectifiersCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured used rectifier capacity."
 	::= { rectifiersCapacity 1 }
 
@@ -4796,7 +4796,7 @@ rectifiersCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the used rectifier capacity monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifiersCapacity 2 }
@@ -4805,9 +4805,9 @@ rectifiersCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifiersCapacity 3 }
@@ -4819,7 +4819,7 @@ rectifiersCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifiersCapacity 4 }
 
@@ -4827,7 +4827,7 @@ rectifiersCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The used rectifier capacity value presented in percentage of the total installed rectifier capacity."
 	::= { rectifiersCapacity 5 }
 
@@ -4835,7 +4835,7 @@ rectifiersCapacityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifiersCapacity 6 }
 
@@ -4843,7 +4843,7 @@ rectifiersCapacityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifiersCapacity 7 }
 
@@ -4872,7 +4872,7 @@ rectifiersErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { rectifiersError 1 }
 
@@ -4880,7 +4880,7 @@ rectifiersErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifiersError 2 }
@@ -4889,9 +4889,9 @@ rectifiersErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifiersError 3 }
@@ -4903,7 +4903,7 @@ rectifiersErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifiersError 4 }
 
@@ -4911,7 +4911,7 @@ rectifiersErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed rectifiers."
 	::= { rectifiersError 5 }
 
@@ -4919,7 +4919,7 @@ rectifiersErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifiersError 6 }
 
@@ -4927,7 +4927,7 @@ rectifiersErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifiersError 7 }
 
@@ -4935,7 +4935,7 @@ rectifiersNumberOfRectifiers  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed rectifiers."
 	::= { rectifiers 5 }
 
@@ -4943,7 +4943,7 @@ rectifierTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each rectifier installed in the system."
 	::= { rectifiers 6 }
 
@@ -4951,7 +4951,7 @@ rectifierEntry  OBJECT-TYPE
 	SYNTAX 	RectifierEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierIndex }
 	::= { rectifierTable 1 }
@@ -4983,7 +4983,7 @@ rectifierIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100  of rectifierTable"
 	::= { rectifierEntry 1 }
 
@@ -5012,7 +5012,7 @@ rectifierStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of rectifier."
 	::= { rectifierEntry 2 }
 
@@ -5020,7 +5020,7 @@ rectifierOutputCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of rectifier."
 	::= { rectifierEntry 3 }
 
@@ -5028,7 +5028,7 @@ rectifierInputVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of rectifier."
 	::= { rectifierEntry 4 }
 
@@ -5036,7 +5036,7 @@ rectifierType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of rectifier"
 	::= { rectifierEntry 5 }
 
@@ -5044,7 +5044,7 @@ rectifierHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of rectifier"
 	::= { rectifierEntry 6 }
 
@@ -5052,7 +5052,7 @@ rectifierHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version number of rectifier"
 	::= { rectifierEntry 7 }
 
@@ -5060,7 +5060,7 @@ rectifierSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number of secondary software in rectifier"
 	::= { rectifierEntry 8 }
 
@@ -5068,7 +5068,7 @@ rectifierSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Version number of secondary software in rectifier"
 	::= { rectifierEntry 9 }
 
@@ -5076,7 +5076,7 @@ rectifierSerialNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Serial number of rectifier"
 	::= { rectifierEntry 10 }
 
@@ -5084,7 +5084,7 @@ rectifiersEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered from rectifiers."
 	::= { rectifiersEnergyLog 1 }
 
@@ -5092,7 +5092,7 @@ rectifiersEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier hourly energy log."
 	::= { rectifiersEnergyLog 2 }
 
@@ -5100,7 +5100,7 @@ rectifiersEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifiersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of rectifiers."
 	::= { rectifiersEnergyLog 3 }
 
@@ -5108,7 +5108,7 @@ rectifiersEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	RectifiersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifiersEnergyLogLastHoursIndex }
 	::= { rectifiersEnergyLogLastHoursTable 1 }
@@ -5124,7 +5124,7 @@ rectifiersEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifiersEnergyLogLastHoursTable"
 	::= { rectifiersEnergyLogLastHoursEntry 1 }
 
@@ -5132,7 +5132,7 @@ rectifiersEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { rectifiersEnergyLogLastHoursEntry 2 }
 
@@ -5140,7 +5140,7 @@ rectifiersEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier daily energy log."
 	::= { rectifiersEnergyLog 4 }
 
@@ -5148,7 +5148,7 @@ rectifiersEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifiersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of rectifiers."
 	::= { rectifiersEnergyLog 5 }
 
@@ -5156,7 +5156,7 @@ rectifiersEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	RectifiersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifiersEnergyLogLastDaysIndex }
 	::= { rectifiersEnergyLogLastDaysTable 1 }
@@ -5172,7 +5172,7 @@ rectifiersEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifiersEnergyLogLastDaysTable"
 	::= { rectifiersEnergyLogLastDaysEntry 1 }
 
@@ -5180,7 +5180,7 @@ rectifiersEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { rectifiersEnergyLogLastDaysEntry 2 }
 
@@ -5188,7 +5188,7 @@ rectifiersEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier weekly energy log."
 	::= { rectifiersEnergyLog 6 }
 
@@ -5196,7 +5196,7 @@ rectifiersEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifiersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of rectifiers."
 	::= { rectifiersEnergyLog 7 }
 
@@ -5204,7 +5204,7 @@ rectifiersEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	RectifiersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifiersEnergyLogLastWeeksIndex }
 	::= { rectifiersEnergyLogLastWeeksTable 1 }
@@ -5220,7 +5220,7 @@ rectifiersEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifiersEnergyLogLastWeekTable"
 	::= { rectifiersEnergyLogLastWeeksEntry 1 }
 
@@ -5228,7 +5228,7 @@ rectifiersEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { rectifiersEnergyLogLastWeeksEntry 2 }
 
@@ -5236,7 +5236,7 @@ rectifiersNumberOfGroups  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of rectifier groups"
 	::= { rectifiers 8 }
 
@@ -5244,7 +5244,7 @@ rectifierGroupsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains status and the number of installed rectifiers of each rectifier groups."
 	::= { rectifiers 9 }
 
@@ -5252,7 +5252,7 @@ rectifierGroupsEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupsTable 1 }
@@ -5270,7 +5270,7 @@ rectifierGroupIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..10  of rectifierGroupsTable"
 	::= { rectifierGroupsEntry 1 }
 
@@ -5299,7 +5299,7 @@ rectifierGroupStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of each rectifier group."
 	::= { rectifierGroupsEntry 2 }
 
@@ -5307,7 +5307,7 @@ rectifierGroupNumberOfRectifiers  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed rectifiers in each rectifier groups"
 	::= { rectifierGroupsEntry 3 }
 
@@ -5315,8 +5315,8 @@ rectifierGroupCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
-		"This table contains information about the total rectifier current of each rectifier groups, which is calculated 
+	DESCRIPTION
+		"This table contains information about the total rectifier current of each rectifier groups, which is calculated
 		 by summing up current from each rectifier in a rectifier group."
 	::= { rectifiers 10 }
 
@@ -5324,7 +5324,7 @@ rectifierGroupCurrentEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupCurrentTable 1 }
@@ -5371,7 +5371,7 @@ rectifierGroupCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current of the rectifier group"
 	::= { rectifierGroupCurrentEntry 1 }
 
@@ -5379,7 +5379,7 @@ rectifierGroupCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor of a rectifier group. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifierGroupCurrentEntry 2 }
@@ -5388,9 +5388,9 @@ rectifierGroupCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifierGroupCurrentEntry 3 }
@@ -5402,7 +5402,7 @@ rectifierGroupCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifierGroupCurrentEntry 4 }
 
@@ -5410,7 +5410,7 @@ rectifierGroupCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current of each rectifier group."
 	::= { rectifierGroupCurrentEntry 5 }
 
@@ -5418,7 +5418,7 @@ rectifierGroupCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifierGroupCurrentEntry 6 }
 
@@ -5426,7 +5426,7 @@ rectifierGroupCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifierGroupCurrentEntry 7 }
 
@@ -5434,7 +5434,7 @@ rectifierGroupCapacityTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupCapacityEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		" This table contains information about the used rectifier capacity of each rectifier group."
 	::= { rectifiers 11 }
 
@@ -5442,7 +5442,7 @@ rectifierGroupCapacityEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupCapacityEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupCapacityTable 1 }
@@ -5489,7 +5489,7 @@ rectifierGroupCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured used rectifier capacity of each rectifier group"
 	::= { rectifierGroupCapacityEntry 1 }
 
@@ -5497,7 +5497,7 @@ rectifierGroupCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the used rectifier capacity monitor of each rectifier group. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifierGroupCapacityEntry 2 }
@@ -5506,9 +5506,9 @@ rectifierGroupCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifierGroupCapacityEntry 3 }
@@ -5520,7 +5520,7 @@ rectifierGroupCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifierGroupCapacityEntry 4 }
 
@@ -5528,7 +5528,7 @@ rectifierGroupCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The used rectifier capacity value presented in percentage of the total installed rectifier capacity of each rectifier group."
 	::= { rectifierGroupCapacityEntry 5 }
 
@@ -5536,7 +5536,7 @@ rectifierGroupCapacityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifierGroupCapacityEntry 6 }
 
@@ -5544,7 +5544,7 @@ rectifierGroupCapacityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifierGroupCapacityEntry 7 }
 
@@ -5552,7 +5552,7 @@ rectifierGroupErrorTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupErrorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		" This table contains information about the rectifier error monitor of each rectifier group."
 	::= { rectifiers 12 }
 
@@ -5560,7 +5560,7 @@ rectifierGroupErrorEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupErrorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupErrorTable 1 }
@@ -5607,7 +5607,7 @@ rectifierGroupErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { rectifierGroupErrorEntry 1 }
 
@@ -5615,7 +5615,7 @@ rectifierGroupErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier error monitor of each rectifier group. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifierGroupErrorEntry 2 }
@@ -5624,9 +5624,9 @@ rectifierGroupErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifierGroupErrorEntry 3 }
@@ -5638,7 +5638,7 @@ rectifierGroupErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifierGroupErrorEntry 4 }
 
@@ -5646,7 +5646,7 @@ rectifierGroupErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed rectifiers of each rectifier group."
 	::= { rectifierGroupErrorEntry 5 }
 
@@ -5654,7 +5654,7 @@ rectifierGroupErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectifierGroupErrorEntry 6 }
 
@@ -5662,7 +5662,7 @@ rectifierGroupErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectifierGroupErrorEntry 7 }
 
@@ -5670,7 +5670,7 @@ rectifierGroupRectifierTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupRectifierEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each rectifier installed in each of the rectifier group in the system."
 	::= { rectifiers 13 }
 
@@ -5678,9 +5678,9 @@ rectifierGroupRectifierEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupRectifierEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { rectifierGroupIndex, 
+	INDEX { rectifierGroupIndex,
 		rectifierGroupRectifierIndex }
 	::= { rectifierGroupRectifierTable 1 }
 
@@ -5709,7 +5709,7 @@ rectifierGroupRectifierIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100  of rectifierGroupRectifierTable"
 	::= { rectifierGroupRectifierEntry 1 }
 
@@ -5738,7 +5738,7 @@ rectifierGroupRectifierStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of rectifier."
 	::= { rectifierGroupRectifierEntry 2 }
 
@@ -5746,7 +5746,7 @@ rectifierGroupRectifierOutputCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of rectifier."
 	::= { rectifierGroupRectifierEntry 3 }
 
@@ -5754,7 +5754,7 @@ rectifierGroupRectifierInputVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of rectifier."
 	::= { rectifierGroupRectifierEntry 4 }
 
@@ -5762,7 +5762,7 @@ rectifierGroupRectifierType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of rectifier"
 	::= { rectifierGroupRectifierEntry 5 }
 
@@ -5770,7 +5770,7 @@ rectifierGroupRectifierHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of rectifier"
 	::= { rectifierGroupRectifierEntry 6 }
 
@@ -5778,7 +5778,7 @@ rectifierGroupRectifierHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version number of rectifier"
 	::= { rectifierGroupRectifierEntry 7 }
 
@@ -5786,7 +5786,7 @@ rectifierGroupRectifierSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number of secondary software in rectifier"
 	::= { rectifierGroupRectifierEntry 8 }
 
@@ -5794,7 +5794,7 @@ rectifierGroupRectifierSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Version number of secondary software in rectifier"
 	::= { rectifierGroupRectifierEntry 9 }
 
@@ -5802,7 +5802,7 @@ rectifierGroupEnergyLogTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupEnergyLogEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		" This branch contains information about rectifiers' energy logs of each rectifier group."
 	::= { rectifiers 14 }
 
@@ -5810,7 +5810,7 @@ rectifierGroupEnergyLogEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupEnergyLogEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupEnergyLogTable 1 }
@@ -5830,7 +5830,7 @@ rectifierGroupEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered from rectifiers of each rectifier group."
 	::= { rectifierGroupEnergyLogEntry 1 }
 
@@ -5838,7 +5838,7 @@ rectifierGroupEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier group hourly energy log."
 	::= { rectifierGroupEnergyLogEntry 2 }
 
@@ -5846,7 +5846,7 @@ rectifierGroupEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier group daily energy log."
 	::= { rectifierGroupEnergyLogEntry 3 }
 
@@ -5854,7 +5854,7 @@ rectifierGroupEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in rectifier group weekly energy log."
 	::= { rectifierGroupEnergyLogEntry 4 }
 
@@ -5862,7 +5862,7 @@ rectifierGroupEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of each rectifier group"
 	::= { rectifiers 15 }
 
@@ -5870,9 +5870,9 @@ rectifierGroupEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { rectifierGroupIndex, 
+	INDEX { rectifierGroupIndex,
 		rectifierGroupEnergyLogLastHoursIndex }
 	::= { rectifierGroupEnergyLogLastHoursTable 1 }
 
@@ -5887,7 +5887,7 @@ rectifierGroupEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifierGroupEnergyLogLastHoursTable"
 	::= { rectifierGroupEnergyLogLastHoursEntry 1 }
 
@@ -5895,7 +5895,7 @@ rectifierGroupEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { rectifierGroupEnergyLogLastHoursEntry 2 }
 
@@ -5903,7 +5903,7 @@ rectifierGroupEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of each rectifier group"
 	::= { rectifiers 16 }
 
@@ -5911,9 +5911,9 @@ rectifierGroupEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { rectifierGroupIndex, 
+	INDEX { rectifierGroupIndex,
 		rectifierGroupEnergyLogLastDaysIndex }
 	::= { rectifierGroupEnergyLogLastDaysTable 1 }
 
@@ -5928,7 +5928,7 @@ rectifierGroupEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifierGroupEnergyLogLasDaysTable"
 	::= { rectifierGroupEnergyLogLastDaysEntry 1 }
 
@@ -5936,7 +5936,7 @@ rectifierGroupEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { rectifierGroupEnergyLogLastDaysEntry 2 }
 
@@ -5944,7 +5944,7 @@ rectifierGroupEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of each rectifier group"
 	::= { rectifiers 17 }
 
@@ -5952,9 +5952,9 @@ rectifierGroupEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { rectifierGroupIndex, 
+	INDEX { rectifierGroupIndex,
 		rectifierGroupEnergyLogLastWeeksIndex }
 	::= { rectifierGroupEnergyLogLastWeeksTable 1 }
 
@@ -5969,7 +5969,7 @@ rectifierGroupEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of rectifierGroupEnergyLogLastWeeksTable"
 	::= { rectifierGroupEnergyLogLastWeeksEntry 1 }
 
@@ -5977,7 +5977,7 @@ rectifierGroupEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { rectifierGroupEnergyLogLastWeeksEntry 2 }
 
@@ -6006,7 +6006,7 @@ rectifiersTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the rectifier temperature can be either one of the defined enumerated values"
 	::= { rectifiersTemperature 1 }
 
@@ -6014,7 +6014,7 @@ rectifiersTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { rectifiersTemperature 2 }
@@ -6023,9 +6023,9 @@ rectifiersTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifiersTemperature 3 }
@@ -6037,7 +6037,7 @@ rectifiersTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifiersTemperature 4 }
 
@@ -6045,7 +6045,7 @@ rectifiersTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the rectifier temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -6055,7 +6055,7 @@ rectifiersTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { rectifiersTemperature 6 }
 
@@ -6063,7 +6063,7 @@ rectifiersTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { rectifiersTemperature 7 }
 
@@ -6071,7 +6071,7 @@ rectifiersTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { rectifiersTemperature 8 }
 
@@ -6079,7 +6079,7 @@ rectifiersTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { rectifiersTemperature 9 }
 
@@ -6087,8 +6087,8 @@ rectifierGroupTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF RectifierGroupTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
-		"This table contains information about the highest rectifier temperature of each rectifier groups, which is calculated 
+	DESCRIPTION
+		"This table contains information about the highest rectifier temperature of each rectifier groups, which is calculated
 		 by summing up current from each rectifier in a rectifier group."
 	::= { rectifiers 19 }
 
@@ -6096,7 +6096,7 @@ rectifierGroupTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	RectifierGroupTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { rectifierGroupIndex }
 	::= { rectifierGroupTemperatureTable 1 }
@@ -6147,7 +6147,7 @@ rectifierGroupTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured highest rectifier temperature of the rectifier group"
 	::= { rectifierGroupTemperatureEntry 1 }
 
@@ -6155,7 +6155,7 @@ rectifierGroupTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the highest rectifier temperature monitor of a rectifier group. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectifierGroupTemperatureEntry 2 }
@@ -6164,9 +6164,9 @@ rectifierGroupTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectifierGroupTemperatureEntry 3 }
@@ -6178,7 +6178,7 @@ rectifierGroupTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectifierGroupTemperatureEntry 4 }
 
@@ -6186,7 +6186,7 @@ rectifierGroupTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured highest rectifier temperature of each rectifier group."
 	::= { rectifierGroupTemperatureEntry 5 }
 
@@ -6194,7 +6194,7 @@ rectifierGroupTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { rectifierGroupTemperatureEntry 6 }
 
@@ -6202,7 +6202,7 @@ rectifierGroupTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { rectifierGroupTemperatureEntry 7 }
 
@@ -6210,7 +6210,7 @@ rectifierGroupTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { rectifierGroupTemperatureEntry 8 }
 
@@ -6218,7 +6218,7 @@ rectifierGroupTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { rectifierGroupTemperatureEntry 9 }
 
@@ -6229,7 +6229,7 @@ rectifiersCurrentLimitEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable current limit"
 	::= { rectifiers 20 }
 
@@ -6237,7 +6237,7 @@ rectifiersCurrentLimitValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Current limit value"
 	::= { rectifiers 21 }
 
@@ -6245,7 +6245,7 @@ dcdcNumberOfGroups  OBJECT-TYPE
 	SYNTAX     Integer32 (0..5)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of dcdc groups"
 	::= { dcdc 1 }
 
@@ -6253,7 +6253,7 @@ dcdcGroupsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF DcdcGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about dcdc groups."
 	::= { dcdc 2 }
 
@@ -6261,7 +6261,7 @@ dcdcGroupsEntry  OBJECT-TYPE
 	SYNTAX 	DcdcGroupsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { dcdcGroupIndex }
 	::= { dcdcGroupsTable 1 }
@@ -6287,7 +6287,7 @@ dcdcGroupIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { dcdcGroupsEntry 1 }
 
@@ -6316,7 +6316,7 @@ dcdcGroupStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of dcdc group."
 	::= { dcdcGroupsEntry 2 }
 
@@ -6324,7 +6324,7 @@ dcdcGroupNumberOfDcdcConverters  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed dcdc converters."
 	::= { dcdcGroupsEntry 3 }
 
@@ -6332,7 +6332,7 @@ dcdcGroupOutputVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Output voltage of dcdc converters"
 	::= { dcdcGroupsEntry 4 }
 
@@ -6340,7 +6340,7 @@ dcdcNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32 (0..5)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of dcdc currents"
 	::= { dcdcGroupsEntry 5 }
 
@@ -6348,7 +6348,7 @@ dcdcNumberOfCapacities  OBJECT-TYPE
 	SYNTAX     Integer32 (0..5)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of dcdc capacities"
 	::= { dcdcGroupsEntry 6 }
 
@@ -6356,7 +6356,7 @@ dcdcNumberOfAlarms  OBJECT-TYPE
 	SYNTAX     Integer32 (0..5)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of dcdc alarms"
 	::= { dcdcGroupsEntry 7 }
 
@@ -6364,7 +6364,7 @@ dcdcCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF DcdcCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about the total dcdc current."
 	::= { dcdc 3 }
 
@@ -6372,7 +6372,7 @@ dcdcCurrentEntry  OBJECT-TYPE
 	SYNTAX 	DcdcCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { dcdcGroupIndex }
 	::= { dcdcCurrentTable 1 }
@@ -6419,7 +6419,7 @@ dcdcCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total dcdc current."
 	::= { dcdcCurrentEntry 1 }
 
@@ -6427,7 +6427,7 @@ dcdcCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total dcdc current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { dcdcCurrentEntry 2 }
@@ -6436,9 +6436,9 @@ dcdcCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { dcdcCurrentEntry 3 }
@@ -6450,7 +6450,7 @@ dcdcCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { dcdcCurrentEntry 4 }
 
@@ -6458,7 +6458,7 @@ dcdcCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total dcdc current."
 	::= { dcdcCurrentEntry 5 }
 
@@ -6466,7 +6466,7 @@ dcdcCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { dcdcCurrentEntry 6 }
 
@@ -6474,7 +6474,7 @@ dcdcCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { dcdcCurrentEntry 7 }
 
@@ -6482,7 +6482,7 @@ dcdcCapacityTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF DcdcCapacityEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about the used dcdc capacity."
 	::= { dcdc 4 }
 
@@ -6490,7 +6490,7 @@ dcdcCapacityEntry  OBJECT-TYPE
 	SYNTAX 	DcdcCapacityEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { dcdcGroupIndex }
 	::= { dcdcCapacityTable 1 }
@@ -6537,7 +6537,7 @@ dcdcCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured used dcdc capacity."
 	::= { dcdcCapacityEntry 1 }
 
@@ -6545,7 +6545,7 @@ dcdcCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the used dcdc capacity monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { dcdcCapacityEntry 2 }
@@ -6554,9 +6554,9 @@ dcdcCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes of"
 	::= { dcdcCapacityEntry 3 }
@@ -6568,7 +6568,7 @@ dcdcCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { dcdcCapacityEntry 4 }
 
@@ -6576,7 +6576,7 @@ dcdcCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The used dcdc capacity value presented in percentage of the total installed dcdc capacity."
 	::= { dcdcCapacityEntry 5 }
 
@@ -6584,7 +6584,7 @@ dcdcCapacityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { dcdcCapacityEntry 6 }
 
@@ -6592,7 +6592,7 @@ dcdcCapacityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { dcdcCapacityEntry 7 }
 
@@ -6600,7 +6600,7 @@ dcdcTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF DcdcEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each dcdc converter installed in the system."
 	::= { dcdc 5 }
 
@@ -6608,9 +6608,9 @@ dcdcEntry  OBJECT-TYPE
 	SYNTAX 	DcdcEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { dcdcGroupIndex, 
+	INDEX { dcdcGroupIndex,
 		dcdcIndex }
 	::= { dcdcTable 1 }
 
@@ -6641,7 +6641,7 @@ dcdcIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100  of dcdcTable"
 	::= { dcdcEntry 1 }
 
@@ -6670,7 +6670,7 @@ dcdcStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of dcdc converter"
 	::= { dcdcEntry 2 }
 
@@ -6678,7 +6678,7 @@ dcdcOutputCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of dcdc."
 	::= { dcdcEntry 3 }
 
@@ -6686,7 +6686,7 @@ dcdcInputVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of dcdc."
 	::= { dcdcEntry 4 }
 
@@ -6694,7 +6694,7 @@ dcdcType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of dcdc converter"
 	::= { dcdcEntry 5 }
 
@@ -6702,7 +6702,7 @@ dcdcHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of dcdc converter"
 	::= { dcdcEntry 6 }
 
@@ -6710,7 +6710,7 @@ dcdcHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version number of dcdc converter"
 	::= { dcdcEntry 7 }
 
@@ -6718,7 +6718,7 @@ dcdcSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number of secondary software in dcdc converter"
 	::= { dcdcEntry 8 }
 
@@ -6726,7 +6726,7 @@ dcdcSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Version number of secondary software in dcdc converter"
 	::= { dcdcEntry 9 }
 
@@ -6734,7 +6734,7 @@ dcdcErrorTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF DcdcErrorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about the dcdc error monitor."
 	::= { dcdc 6 }
 
@@ -6742,7 +6742,7 @@ dcdcErrorEntry  OBJECT-TYPE
 	SYNTAX 	DcdcErrorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { dcdcGroupIndex }
 	::= { dcdcErrorTable 1 }
@@ -6789,7 +6789,7 @@ dcdcErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { dcdcErrorEntry 1 }
 
@@ -6797,7 +6797,7 @@ dcdcErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the dcdc error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { dcdcErrorEntry 2 }
@@ -6806,9 +6806,9 @@ dcdcErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { dcdcErrorEntry 3 }
@@ -6820,7 +6820,7 @@ dcdcErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { dcdcErrorEntry 4 }
 
@@ -6828,7 +6828,7 @@ dcdcErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed dcdc converters."
 	::= { dcdcErrorEntry 5 }
 
@@ -6836,7 +6836,7 @@ dcdcErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { dcdcErrorEntry 6 }
 
@@ -6844,7 +6844,7 @@ dcdcErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { dcdcErrorEntry 7 }
 
@@ -6873,7 +6873,7 @@ solarChargersStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of solar charger subsystem."
 	::= { solarChargers 1 }
 
@@ -6902,7 +6902,7 @@ solarChargersCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total solar current."
 	::= { solarChargersCurrent 1 }
 
@@ -6910,7 +6910,7 @@ solarChargersCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total solar current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { solarChargersCurrent 2 }
@@ -6919,9 +6919,9 @@ solarChargersCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { solarChargersCurrent 3 }
@@ -6933,7 +6933,7 @@ solarChargersCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { solarChargersCurrent 4 }
 
@@ -6941,7 +6941,7 @@ solarChargersCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total solar current."
 	::= { solarChargersCurrent 5 }
 
@@ -6949,7 +6949,7 @@ solarChargersCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { solarChargersCurrent 6 }
 
@@ -6957,7 +6957,7 @@ solarChargersCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { solarChargersCurrent 7 }
 
@@ -6986,7 +6986,7 @@ solarChargersErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { solarChargersError 1 }
 
@@ -6994,7 +6994,7 @@ solarChargersErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the solar error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { solarChargersError 2 }
@@ -7003,9 +7003,9 @@ solarChargersErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { solarChargersError 3 }
@@ -7017,7 +7017,7 @@ solarChargersErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { solarChargersError 4 }
 
@@ -7025,7 +7025,7 @@ solarChargersErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed solar chargers."
 	::= { solarChargersError 5 }
 
@@ -7033,7 +7033,7 @@ solarChargersErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { solarChargersError 6 }
 
@@ -7041,7 +7041,7 @@ solarChargersErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { solarChargersError 7 }
 
@@ -7049,7 +7049,7 @@ solarChargersNumberOfSolarChargers  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed solar chargers."
 	::= { solarChargers 5 }
 
@@ -7057,7 +7057,7 @@ solarChargerTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF SolarChargerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each solar charger installed in the system."
 	::= { solarChargers 6 }
 
@@ -7065,7 +7065,7 @@ solarChargerEntry  OBJECT-TYPE
 	SYNTAX 	SolarChargerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { solarChargerIndex }
 	::= { solarChargerTable 1 }
@@ -7095,7 +7095,7 @@ solarChargerIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100 of solarChargerTable"
 	::= { solarChargerEntry 1 }
 
@@ -7124,7 +7124,7 @@ solarChargerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of solar charger."
 	::= { solarChargerEntry 2 }
 
@@ -7132,7 +7132,7 @@ solarChargerOutputCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of solar charger."
 	::= { solarChargerEntry 3 }
 
@@ -7140,7 +7140,7 @@ solarChargerInputVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of solar charger."
 	::= { solarChargerEntry 4 }
 
@@ -7148,7 +7148,7 @@ solarChargerType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of solar charger"
 	::= { solarChargerEntry 5 }
 
@@ -7156,7 +7156,7 @@ solarChargerHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of solar charger"
 	::= { solarChargerEntry 6 }
 
@@ -7164,7 +7164,7 @@ solarChargerHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version number of solar charger"
 	::= { solarChargerEntry 7 }
 
@@ -7172,7 +7172,7 @@ solarChargerSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number of secondary software in solar charger"
 	::= { solarChargerEntry 8 }
 
@@ -7180,7 +7180,7 @@ solarChargerSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Version number of secondary software in solar charger"
 	::= { solarChargerEntry 9 }
 
@@ -7188,7 +7188,7 @@ solarChargersEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered from solar chargers."
 	::= { solarChargersEnergyLog 1 }
 
@@ -7196,7 +7196,7 @@ solarChargersEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in solar charger hourly energy log."
 	::= { solarChargersEnergyLog 2 }
 
@@ -7204,7 +7204,7 @@ solarChargersEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF SolarChargersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of solar chargers."
 	::= { solarChargersEnergyLog 3 }
 
@@ -7212,7 +7212,7 @@ solarChargersEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	SolarChargersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { solarChargersEnergyLogLastHoursIndex }
 	::= { solarChargersEnergyLogLastHoursTable 1 }
@@ -7228,7 +7228,7 @@ solarChargersEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of solarChargersEnergyLogLastHoursTable"
 	::= { solarChargersEnergyLogLastHoursEntry 1 }
 
@@ -7236,7 +7236,7 @@ solarChargersEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { solarChargersEnergyLogLastHoursEntry 2 }
 
@@ -7244,7 +7244,7 @@ solarChargersEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in solar charger daily energy log."
 	::= { solarChargersEnergyLog 4 }
 
@@ -7252,7 +7252,7 @@ solarChargersEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF SolarChargersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of solar chargers."
 	::= { solarChargersEnergyLog 5 }
 
@@ -7260,7 +7260,7 @@ solarChargersEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	SolarChargersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { solarChargersEnergyLogLastDaysIndex }
 	::= { solarChargersEnergyLogLastDaysTable 1 }
@@ -7276,7 +7276,7 @@ solarChargersEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of solarChargersEnergyLogLastDaysTable"
 	::= { solarChargersEnergyLogLastDaysEntry 1 }
 
@@ -7284,7 +7284,7 @@ solarChargersEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { solarChargersEnergyLogLastDaysEntry 2 }
 
@@ -7292,7 +7292,7 @@ solarChargersEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in solar charger weekly energy log."
 	::= { solarChargersEnergyLog 6 }
 
@@ -7300,7 +7300,7 @@ solarChargersEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF SolarChargersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of solar chargers."
 	::= { solarChargersEnergyLog 7 }
 
@@ -7308,7 +7308,7 @@ solarChargersEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	SolarChargersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { solarChargersEnergyLogLastWeeksIndex }
 	::= { solarChargersEnergyLogLastWeeksTable 1 }
@@ -7324,7 +7324,7 @@ solarChargersEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of solarChargersEnergyLogLastWeekTable"
 	::= { solarChargersEnergyLogLastWeeksEntry 1 }
 
@@ -7332,7 +7332,7 @@ solarChargersEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { solarChargersEnergyLogLastWeeksEntry 2 }
 
@@ -7361,7 +7361,7 @@ solarChargersEarthFaultStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of solar charger's Earth Fault monitor"
 	::= { solarChargers 8 }
 
@@ -7390,7 +7390,7 @@ windChargersStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of wind charger subsystem."
 	::= { windChargers 1 }
 
@@ -7419,7 +7419,7 @@ windChargersCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total wind current."
 	::= { windChargersCurrent 1 }
 
@@ -7427,7 +7427,7 @@ windChargersCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total wind current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { windChargersCurrent 2 }
@@ -7436,9 +7436,9 @@ windChargersCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { windChargersCurrent 3 }
@@ -7450,7 +7450,7 @@ windChargersCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { windChargersCurrent 4 }
 
@@ -7458,7 +7458,7 @@ windChargersCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total wind current."
 	::= { windChargersCurrent 5 }
 
@@ -7466,7 +7466,7 @@ windChargersCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { windChargersCurrent 6 }
 
@@ -7474,7 +7474,7 @@ windChargersCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { windChargersCurrent 7 }
 
@@ -7503,7 +7503,7 @@ windChargersErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { windChargersError 1 }
 
@@ -7511,7 +7511,7 @@ windChargersErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the wind error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { windChargersError 2 }
@@ -7520,9 +7520,9 @@ windChargersErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { windChargersError 3 }
@@ -7534,7 +7534,7 @@ windChargersErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { windChargersError 4 }
 
@@ -7542,7 +7542,7 @@ windChargersErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed wind chargers."
 	::= { windChargersError 5 }
 
@@ -7550,7 +7550,7 @@ windChargersErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { windChargersError 6 }
 
@@ -7558,7 +7558,7 @@ windChargersErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { windChargersError 7 }
 
@@ -7566,7 +7566,7 @@ windChargersNumberOfWindChargers  OBJECT-TYPE
 	SYNTAX     Integer32 (0..254)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed wind chargers."
 	::= { windChargers 5 }
 
@@ -7574,7 +7574,7 @@ windChargerTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF WindChargerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each wind charger installed in the system."
 	::= { windChargers 6 }
 
@@ -7582,7 +7582,7 @@ windChargerEntry  OBJECT-TYPE
 	SYNTAX 	WindChargerEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { windChargerIndex }
 	::= { windChargerTable 1 }
@@ -7612,7 +7612,7 @@ windChargerIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100 of windChargerTable"
 	::= { windChargerEntry 1 }
 
@@ -7641,7 +7641,7 @@ windChargerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of wind charger."
 	::= { windChargerEntry 2 }
 
@@ -7649,7 +7649,7 @@ windChargerOutputCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of wind charger."
 	::= { windChargerEntry 3 }
 
@@ -7657,7 +7657,7 @@ windChargerInputVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of wind charger."
 	::= { windChargerEntry 4 }
 
@@ -7665,7 +7665,7 @@ windChargerType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of wind charger"
 	::= { windChargerEntry 5 }
 
@@ -7673,7 +7673,7 @@ windChargerHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of wind charger"
 	::= { windChargerEntry 6 }
 
@@ -7681,7 +7681,7 @@ windChargerHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version number of wind charger"
 	::= { windChargerEntry 7 }
 
@@ -7689,7 +7689,7 @@ windChargerSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number of secondary software in wind charger"
 	::= { windChargerEntry 8 }
 
@@ -7697,7 +7697,7 @@ windChargerSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..6))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Version number of secondary software in wind charger"
 	::= { windChargerEntry 9 }
 
@@ -7705,7 +7705,7 @@ windChargersEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered to/from wind chargers."
 	::= { windChargersEnergyLog 1 }
 
@@ -7713,7 +7713,7 @@ windChargersEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in wind charger hourly energy log."
 	::= { windChargersEnergyLog 2 }
 
@@ -7721,7 +7721,7 @@ windChargersEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF WindChargersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of wind chargers."
 	::= { windChargersEnergyLog 3 }
 
@@ -7729,7 +7729,7 @@ windChargersEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	WindChargersEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { windChargersEnergyLogLastHoursIndex }
 	::= { windChargersEnergyLogLastHoursTable 1 }
@@ -7745,7 +7745,7 @@ windChargersEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of windChargersEnergyLogLastHoursTable"
 	::= { windChargersEnergyLogLastHoursEntry 1 }
 
@@ -7753,7 +7753,7 @@ windChargersEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { windChargersEnergyLogLastHoursEntry 2 }
 
@@ -7761,7 +7761,7 @@ windChargersEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in wind charger daily energy log."
 	::= { windChargersEnergyLog 4 }
 
@@ -7769,7 +7769,7 @@ windChargersEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF WindChargersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of wind chargers."
 	::= { windChargersEnergyLog 5 }
 
@@ -7777,7 +7777,7 @@ windChargersEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	WindChargersEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { windChargersEnergyLogLastDaysIndex }
 	::= { windChargersEnergyLogLastDaysTable 1 }
@@ -7793,7 +7793,7 @@ windChargersEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of windChargersEnergyLogLastDaysTable"
 	::= { windChargersEnergyLogLastDaysEntry 1 }
 
@@ -7801,7 +7801,7 @@ windChargersEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { windChargersEnergyLogLastDaysEntry 2 }
 
@@ -7809,7 +7809,7 @@ windChargersEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in wind charger weekly energy log."
 	::= { windChargersEnergyLog 6 }
 
@@ -7817,7 +7817,7 @@ windChargersEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF WindChargersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of wind chargers."
 	::= { windChargersEnergyLog 7 }
 
@@ -7825,7 +7825,7 @@ windChargersEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	WindChargersEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { windChargersEnergyLogLastWeeksIndex }
 	::= { windChargersEnergyLogLastWeeksTable 1 }
@@ -7841,7 +7841,7 @@ windChargersEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of windChargersEnergyLogLastWeekTable"
 	::= { windChargersEnergyLogLastWeeksEntry 1 }
 
@@ -7849,7 +7849,7 @@ windChargersEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { windChargersEnergyLogLastWeeksEntry 2 }
 
@@ -7878,7 +7878,7 @@ loadStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of load subsystem."
 	::= { load 1 }
 
@@ -7907,7 +7907,7 @@ loadCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured load current."
 	::= { loadCurrent 1 }
 
@@ -7915,7 +7915,7 @@ loadCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the load current monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { loadCurrent 2 }
@@ -7924,9 +7924,9 @@ loadCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { loadCurrent 3 }
@@ -7938,7 +7938,7 @@ loadCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { loadCurrent 4 }
 
@@ -7946,7 +7946,7 @@ loadCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured load current."
 	::= { loadCurrent 5 }
 
@@ -7954,7 +7954,7 @@ loadCurrentMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { loadCurrent 6 }
 
@@ -7962,7 +7962,7 @@ loadCurrentMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { loadCurrent 7 }
 
@@ -7991,7 +7991,7 @@ loadFusesStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of the load fuses."
 	::= { load 3 }
 
@@ -7999,7 +7999,7 @@ loadNumberOfGroups  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of load groups"
 	::= { load 4 }
 
@@ -8007,7 +8007,7 @@ loadGroupTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadGroupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about load groups."
 	::= { load 5 }
 
@@ -8015,7 +8015,7 @@ loadGroupEntry  OBJECT-TYPE
 	SYNTAX 	LoadGroupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { loadGroupIndex }
 	::= { loadGroupTable 1 }
@@ -8035,7 +8035,7 @@ loadGroupIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..8  of loadGroupTable"
 	::= { loadGroupEntry 1 }
 
@@ -8064,7 +8064,7 @@ loadGroupStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of load group"
 	::= { loadGroupEntry 2 }
 
@@ -8072,7 +8072,7 @@ loadNumberOfLVLDs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of LVLDs installed in load group"
 	::= { loadGroupEntry 3 }
 
@@ -8080,7 +8080,7 @@ loadNumberOfVoltages  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of voltages in load group"
 	::= { loadGroupEntry 4 }
 
@@ -8088,7 +8088,7 @@ loadLVLDTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadLVLDEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about LVLDs"
 	::= { load 6 }
 
@@ -8096,9 +8096,9 @@ loadLVLDEntry  OBJECT-TYPE
 	SYNTAX 	LoadLVLDEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { loadGroupIndex, 
+	INDEX { loadGroupIndex,
 		loadLVLDIndex }
 	::= { loadLVLDTable 1 }
 
@@ -8129,7 +8129,7 @@ loadLVLDIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..8  of loadLVLDTable"
 	::= { loadLVLDEntry 1 }
 
@@ -8158,7 +8158,7 @@ loadLVLDStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of LVLD"
 	::= { loadLVLDEntry 2 }
 
@@ -8166,7 +8166,7 @@ loadLVLDDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the LVLD. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { loadLVLDEntry 3 }
@@ -8175,9 +8175,9 @@ loadLVLDTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { loadLVLDEntry 4 }
@@ -8189,7 +8189,7 @@ loadLVLDEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the LVLD will be reported."
 	::= { loadLVLDEntry 5 }
 
@@ -8197,7 +8197,7 @@ loadLVLDValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the LVLD."
 	::= { loadLVLDEntry 6 }
 
@@ -8205,7 +8205,7 @@ loadLVLDConnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The load Contactor's Reconnect Voltage"
 	::= { loadLVLDEntry 7 }
 
@@ -8213,7 +8213,7 @@ loadLVLDDisconnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The load Contactor's Disconnect Voltage"
 	::= { loadLVLDEntry 8 }
 
@@ -8224,7 +8224,7 @@ loadLVLDDisconnectDelayEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable LVLD disconnect delay."
 	::= { loadLVLDEntry 9 }
 
@@ -8232,7 +8232,7 @@ loadLVLDDisconnectDelayTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"LVLD disconnect delay time in minutes."
 	::= { loadLVLDEntry 10 }
 
@@ -8240,7 +8240,7 @@ loadFuseTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about load fuse "
 	::= { load 7 }
 
@@ -8248,7 +8248,7 @@ loadFuseEntry  OBJECT-TYPE
 	SYNTAX 	LoadFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { loadGroupIndex }
 	::= { loadFuseTable 1 }
@@ -8283,7 +8283,7 @@ loadFuseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of load fuse"
 	::= { loadFuseEntry 1 }
 
@@ -8291,7 +8291,7 @@ loadFuseDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the load fuse monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { loadFuseEntry 2 }
@@ -8300,9 +8300,9 @@ loadFuseTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { loadFuseEntry 3 }
@@ -8314,7 +8314,7 @@ loadFuseAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { loadFuseEntry 4 }
 
@@ -8322,7 +8322,7 @@ loadFuseValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the load fuse."
 	::= { loadFuseEntry 5 }
 
@@ -8330,7 +8330,7 @@ loadEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered to load."
 	::= { loadEnergyLog 1 }
 
@@ -8338,7 +8338,7 @@ loadEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in load hourly energy log."
 	::= { loadEnergyLog 2 }
 
@@ -8346,7 +8346,7 @@ loadEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { loadEnergyLog 3 }
 
@@ -8354,7 +8354,7 @@ loadEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	LoadEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { loadEnergyLogLastHoursIndex }
 	::= { loadEnergyLogLastHoursTable 1 }
@@ -8370,7 +8370,7 @@ loadEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of loadEnergyLogLastHoursTable"
 	::= { loadEnergyLogLastHoursEntry 1 }
 
@@ -8378,7 +8378,7 @@ loadEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { loadEnergyLogLastHoursEntry 2 }
 
@@ -8386,7 +8386,7 @@ loadEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in load daily energy log."
 	::= { loadEnergyLog 4 }
 
@@ -8394,7 +8394,7 @@ loadEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { loadEnergyLog 5 }
 
@@ -8402,7 +8402,7 @@ loadEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	LoadEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { loadEnergyLogLastDaysIndex }
 	::= { loadEnergyLogLastDaysTable 1 }
@@ -8418,7 +8418,7 @@ loadEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of loadEnergyLogLastDaysTable"
 	::= { loadEnergyLogLastDaysEntry 1 }
 
@@ -8426,7 +8426,7 @@ loadEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { loadEnergyLogLastDaysEntry 2 }
 
@@ -8434,7 +8434,7 @@ loadEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in load weekly energy log."
 	::= { loadEnergyLog 6 }
 
@@ -8442,7 +8442,7 @@ loadEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { loadEnergyLog 7 }
 
@@ -8450,7 +8450,7 @@ loadEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	LoadEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { loadEnergyLogLastWeeksIndex }
 	::= { loadEnergyLogLastWeeksTable 1 }
@@ -8466,7 +8466,7 @@ loadEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of loadEnergyLogLastWeekTable"
 	::= { loadEnergyLogLastWeeksEntry 1 }
 
@@ -8474,7 +8474,7 @@ loadEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { loadEnergyLogLastWeeksEntry 2 }
 
@@ -8482,7 +8482,7 @@ loadVoltageTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF LoadVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains information about voltages"
 	::= { load 9 }
 
@@ -8490,9 +8490,9 @@ loadVoltageEntry  OBJECT-TYPE
 	SYNTAX 	LoadVoltageEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { loadGroupIndex, 
+	INDEX { loadGroupIndex,
 		loadVoltageIndex }
 	::= { loadVoltageTable 1 }
 
@@ -8515,7 +8515,7 @@ loadVoltageIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..3)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..3  of loadVoltageTable"
 	::= { loadVoltageEntry 1 }
 
@@ -8544,7 +8544,7 @@ loadVoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of voltage"
 	::= { loadVoltageEntry 2 }
 
@@ -8552,7 +8552,7 @@ loadVoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the voltage. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { loadVoltageEntry 3 }
@@ -8561,9 +8561,9 @@ loadVoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { loadVoltageEntry 4 }
@@ -8575,7 +8575,7 @@ loadVoltageEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the LVLD will be reported."
 	::= { loadVoltageEntry 5 }
 
@@ -8583,11 +8583,11 @@ loadVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the voltage."
 	::= { loadVoltageEntry 6 }
 
--- The reported status of the battery subsystem. The status reflects the condition 
+-- The reported status of the battery subsystem. The status reflects the condition
 -- of all underlying alarm monitors in the battery subsystem
 
 batteryStatus  OBJECT-TYPE
@@ -8615,9 +8615,9 @@ batteryStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"A toplevel status for the battery subsystem.  The state of this reflects the status of all 
-		underlying statuses for the battery. Any change in one of the 'data monitors' in 
+	DESCRIPTION
+		"A toplevel status for the battery subsystem.  The state of this reflects the status of all
+		underlying statuses for the battery. Any change in one of the 'data monitors' in
 		the battery subsystem will propagate up to this status indicator."
 	::= { battery 1 }
 
@@ -8625,7 +8625,7 @@ batteryDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A descriptive name of the battery installed in the system."
 	::= { battery 2 }
 
@@ -8633,7 +8633,7 @@ batteryReferenceVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (840..60417)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Voltage at which the DC System float charges.
 		Acts as reference voltage when running temperature compensated charging."
 	::= { battery 3 }
@@ -8663,12 +8663,12 @@ batteryFusesStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"The state of the battery fuses/breakers can mainly be normal(1) or majorAlarm(3) and  
+	DESCRIPTION
+		"The state of the battery fuses/breakers can mainly be normal(1) or majorAlarm(3) and
 		some other rarely used values ."
 	::= { battery 4 }
 
--- The status value for the measured battery voltage. If the battery voltage reach outside 
+-- The status value for the measured battery voltage. If the battery voltage reach outside
 -- the limits set by the major/minor low/high level settings this status will change accordingly.
 
 batteryVoltageStatus  OBJECT-TYPE
@@ -8696,7 +8696,7 @@ batteryVoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured battery voltage."
 	::= { batteryVoltage 1 }
 
@@ -8704,7 +8704,7 @@ batteryVoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery voltage monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryVoltage 2 }
@@ -8713,9 +8713,9 @@ batteryVoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryVoltage 3 }
@@ -8727,7 +8727,7 @@ batteryVoltageAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery voltage alarm enable/disable control"
 	::= { batteryVoltage 4 }
 
@@ -8735,7 +8735,7 @@ batteryVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured battery voltage. Scale is 0.01v."
 	::= { batteryVoltage 5 }
 
@@ -8743,7 +8743,7 @@ batteryVoltageMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Major High Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryVoltage 6 }
 
@@ -8751,7 +8751,7 @@ batteryVoltageMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Minor High Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryVoltage 7 }
 
@@ -8759,7 +8759,7 @@ batteryVoltageMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Minor Low Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryVoltage 8 }
 
@@ -8767,7 +8767,7 @@ batteryVoltageMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Major Low Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryVoltage 9 }
 
@@ -8796,7 +8796,7 @@ batteryCurrentsStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured battery current"
 	::= { batteryCurrents 1 }
 
@@ -8804,7 +8804,7 @@ batteryCurrentsDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery current monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryCurrents 2 }
@@ -8813,9 +8813,9 @@ batteryCurrentsTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryCurrents 3 }
@@ -8827,7 +8827,7 @@ batteryCurrentsAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryCurrents 4 }
 
@@ -8835,7 +8835,7 @@ batteryCurrentsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured total battery current.
 		This is the sum of all the enabled shunt measurements in the system.
 		Negative battery current indicates discharging of the batteries.
@@ -8847,7 +8847,7 @@ batteryCurrentsMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryCurrents 6 }
 
@@ -8855,7 +8855,7 @@ batteryCurrentsMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryCurrents 7 }
 
@@ -8863,7 +8863,7 @@ batteryCurrentsMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryCurrents 8 }
 
@@ -8871,7 +8871,7 @@ batteryCurrentsMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryCurrents 9 }
 
@@ -8900,7 +8900,7 @@ batteryTemperaturesStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the battery fuses/breakers can be either one of the defined enumerated values"
 	::= { batteryTemperatures 1 }
 
@@ -8908,7 +8908,7 @@ batteryTemperaturesDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryTemperatures 2 }
@@ -8917,9 +8917,9 @@ batteryTemperaturesTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryTemperatures 3 }
@@ -8931,7 +8931,7 @@ batteryTemperaturesAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryTemperatures 4 }
 
@@ -8939,7 +8939,7 @@ batteryTemperaturesValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the enabled battery temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -8949,7 +8949,7 @@ batteryTemperaturesMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryTemperatures 6 }
 
@@ -8957,7 +8957,7 @@ batteryTemperaturesMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryTemperatures 7 }
 
@@ -8965,7 +8965,7 @@ batteryTemperaturesMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryTemperatures 8 }
 
@@ -8973,7 +8973,7 @@ batteryTemperaturesMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryTemperatures 9 }
 
@@ -9002,7 +9002,7 @@ batteryTimeLeftStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the estimated battery remaining backup time."
 	::= { batteryTimeLeft 1 }
 
@@ -9010,7 +9010,7 @@ batteryTimeLeftDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery discharge time monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryTimeLeft 2 }
@@ -9019,9 +9019,9 @@ batteryTimeLeftTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryTimeLeft 3 }
@@ -9033,7 +9033,7 @@ batteryTimeLeftAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryTimeLeft 4 }
 
@@ -9041,7 +9041,7 @@ batteryTimeLeftValue  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The estimated value of battery remaining backup time."
 	::= { batteryTimeLeft 5 }
 
@@ -9049,7 +9049,7 @@ batteryTimeLeftMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryTimeLeft 6 }
 
@@ -9057,7 +9057,7 @@ batteryTimeLeftMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryTimeLeft 7 }
 
@@ -9086,7 +9086,7 @@ batteryRemainingCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery remaining capacity monitor."
 	::= { batteryRemainingCapacity 1 }
 
@@ -9094,7 +9094,7 @@ batteryRemainingCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery remaining capacity monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { batteryRemainingCapacity 2 }
@@ -9103,9 +9103,9 @@ batteryRemainingCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryRemainingCapacity 3 }
@@ -9117,7 +9117,7 @@ batteryRemainingCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryRemainingCapacity 4 }
 
@@ -9125,7 +9125,7 @@ batteryRemainingCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery remaining capacity (SOC) value estimated from the latest battery test result."
 	::= { batteryRemainingCapacity 5 }
 
@@ -9133,7 +9133,7 @@ batteryRemainingCapacityMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryRemainingCapacity 6 }
 
@@ -9141,7 +9141,7 @@ batteryRemainingCapacityMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryRemainingCapacity 7 }
 
@@ -9170,7 +9170,7 @@ batteryUsedCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery used capacity (DoD) monitor"
 	::= { batteryUsedCapacity 1 }
 
@@ -9178,7 +9178,7 @@ batteryUsedCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery used capacity (DoD) monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryUsedCapacity 2 }
@@ -9187,9 +9187,9 @@ batteryUsedCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryUsedCapacity 3 }
@@ -9201,7 +9201,7 @@ batteryUsedCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryUsedCapacity 4 }
 
@@ -9209,7 +9209,7 @@ batteryUsedCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the estimated battery used capacity (DoD)."
 	::= { batteryUsedCapacity 5 }
 
@@ -9217,7 +9217,7 @@ batteryUsedCapacityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryUsedCapacity 6 }
 
@@ -9225,7 +9225,7 @@ batteryUsedCapacityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryUsedCapacity 7 }
 
@@ -9254,7 +9254,7 @@ batteryTotalCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the total capacity monitor."
 	::= { batteryTotalCapacity 1 }
 
@@ -9262,7 +9262,7 @@ batteryTotalCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery total capacity monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryTotalCapacity 2 }
@@ -9271,9 +9271,9 @@ batteryTotalCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryTotalCapacity 3 }
@@ -9285,7 +9285,7 @@ batteryTotalCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryTotalCapacity 4 }
 
@@ -9293,7 +9293,7 @@ batteryTotalCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the estimated total battery capacity (installed Ah - SoH) value."
 	::= { batteryTotalCapacity 5 }
 
@@ -9301,7 +9301,7 @@ batteryTotalCapacityMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryTotalCapacity 6 }
 
@@ -9309,7 +9309,7 @@ batteryTotalCapacityMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryTotalCapacity 7 }
 
@@ -9338,7 +9338,7 @@ batteryQualityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery quality (SoH) monitor."
 	::= { batteryQuality 1 }
 
@@ -9346,7 +9346,7 @@ batteryQualityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery quality (SoH) monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryQuality 2 }
@@ -9355,9 +9355,9 @@ batteryQualityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryQuality 3 }
@@ -9369,7 +9369,7 @@ batteryQualityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryQuality 4 }
 
@@ -9377,7 +9377,7 @@ batteryQualityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery quality (SoH) based on the latest battery test"
 	::= { batteryQuality 5 }
 
@@ -9385,7 +9385,7 @@ batteryQualityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryQuality 6 }
 
@@ -9393,7 +9393,7 @@ batteryQualityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryQuality 7 }
 
@@ -9422,7 +9422,7 @@ batteryLVBDStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor is connected, disconnected, disabled or in any other alarm condition"
 	::= { batteryLVBD 1 }
 
@@ -9430,7 +9430,7 @@ batteryLVBDDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery LVBD monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryLVBD 2 }
@@ -9439,9 +9439,9 @@ batteryLVBDTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryLVBD 3 }
@@ -9453,7 +9453,7 @@ batteryLVBDEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the LVBD will be reported."
 	::= { batteryLVBD 4 }
 
@@ -9461,7 +9461,7 @@ batteryLVBDValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the LVBD."
 	::= { batteryLVBD 5 }
 
@@ -9469,7 +9469,7 @@ batteryLVBDConnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor's Reconnect Voltage"
 	::= { batteryLVBD 6 }
 
@@ -9477,7 +9477,7 @@ batteryLVBDDisconnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor's Disconnect Voltage"
 	::= { batteryLVBD 7 }
 
@@ -9488,7 +9488,7 @@ batteryChargeCurrentLimitEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable of the battery charge current limitation feature; 0=disable, 1=enable."
 	::= { batteryChargeCurrentLimit 1 }
 
@@ -9496,7 +9496,7 @@ batteryChargeCurrentLimitValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..32767)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery charging current limit value. Used only when AC source is mains feed.
 		Note that the units measured may be i Amperes or in Deciamperes depending on global system settings"
 	::= { batteryChargeCurrentLimit 2 }
@@ -9505,7 +9505,7 @@ batteryBoostVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (870..60418)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Voltage at which the DC System boost charges the batteries."
 	::= { batteryBoost 1 }
 
@@ -9517,7 +9517,7 @@ batteryBoostCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery boost if the system allows it."
 	::= { batteryBoost 2 }
 
@@ -9525,7 +9525,7 @@ batteryBoostCurrentThreshold  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The boosting will terminate when the charge current drops below the BoostCurrentThreshold limit."
 	::= { batteryBoost 3 }
 
@@ -9533,8 +9533,8 @@ batteryBoostManualMaxDuration  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"A protection against overcharging.  
+	DESCRIPTION
+		"A protection against overcharging.
 		When running manual boost, the boosting will always terminate at this point.  "
 	::= { batteryBoost 4 }
 
@@ -9542,7 +9542,7 @@ batteryTestVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the simplified battery test end voltage. The battery test will be terminated when the voltage
 		drops below the end voltage."
 	::= { batteryTest 1 }
@@ -9555,7 +9555,7 @@ batteryTestCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery test if the system allows it."
 	::= { batteryTest 2 }
 
@@ -9563,7 +9563,7 @@ batteryTestNumberOfResults  OBJECT-TYPE
 	SYNTAX     Integer32 (0..10)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of valid battery test results stored in controller."
 	::= { batteryTest 3 }
 
@@ -9571,7 +9571,7 @@ batteryTestResultTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryTestResultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the battery test results stored in controller."
 	::= { batteryTest 4 }
 
@@ -9579,7 +9579,7 @@ batteryTestResultEntry  OBJECT-TYPE
 	SYNTAX 	BatteryTestResultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryTestResultIndex }
 	::= { batteryTestResultTable 1 }
@@ -9609,7 +9609,7 @@ batteryTestResultIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A index pointing to one of ten possible battery test results"
 	::= { batteryTestResultEntry 1 }
 
@@ -9617,7 +9617,7 @@ batteryTestResultStartDateTime  OBJECT-TYPE
 	SYNTAX     DateAndTime
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the time and date when the test started."
 	::= { batteryTestResultEntry 2 }
 
@@ -9625,7 +9625,7 @@ batteryTestResultDuration  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test duration in minutes."
 	::= { batteryTestResultEntry 3 }
 
@@ -9633,7 +9633,7 @@ batteryTestResultDischarged  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the discharged Ah during test."
 	::= { batteryTestResultEntry 4 }
 
@@ -9641,7 +9641,7 @@ batteryTestResultQuality  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the calculated battery quality (SoH)in percentage."
 	::= { batteryTestResultEntry 5 }
 
@@ -9649,7 +9649,7 @@ batteryTestResultEndVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test end voltage in volt."
 	::= { batteryTestResultEntry 6 }
 
@@ -9668,7 +9668,7 @@ batteryTestResultTestResult  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test result."
 	::= { batteryTestResultEntry 7 }
 
@@ -9683,7 +9683,7 @@ batteryTestResultTerminationCriteria  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test Termination Criteria."
 	::= { batteryTestResultEntry 8 }
 
@@ -9691,7 +9691,7 @@ batteryTestResultBatteryTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the battery temperature"
 	::= { batteryTestResultEntry 9 }
 
@@ -9699,7 +9699,7 @@ batteryTestDuration  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the battery test max duration. "
 	::= { batteryTest 5 }
 
@@ -9710,7 +9710,7 @@ batteryTestCfgTestType  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is to configurate normal or simplified battery test."
 	::= { batteryTest 6 }
 
@@ -9721,7 +9721,7 @@ batteryTestEnableMaxDuration  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is to enable/disable battery test max duration."
 	::= { batteryTest 7 }
 
@@ -9732,7 +9732,7 @@ batteryTempCompEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable (1) or Disable (0)  of Battery Temperature Compensated output regulation mode"
 	::= { batteryTempComp 1 }
 
@@ -9740,7 +9740,7 @@ batteryBankNumberOfBanks  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of battery banks installed in system."
 	::= { batteryBank 1 }
 
@@ -9748,7 +9748,7 @@ batteryBankTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryBankEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryBank 2 }
 
@@ -9756,7 +9756,7 @@ batteryBankEntry  OBJECT-TYPE
 	SYNTAX 	BatteryBankEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryBankIndex }
 	::= { batteryBankTable 1 }
@@ -9780,7 +9780,7 @@ batteryBankIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..8  of batteryBankTable "
 	::= { batteryBankEntry 1 }
 
@@ -9809,7 +9809,7 @@ batteryBankStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of battery bank"
 	::= { batteryBankEntry 2 }
 
@@ -9817,7 +9817,7 @@ batteryBankNumberOfTemperatures  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of temperature measurements in battery bank."
 	::= { batteryBankEntry 3 }
 
@@ -9825,7 +9825,7 @@ batteryBankNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of current measurements in battery bank."
 	::= { batteryBankEntry 4 }
 
@@ -9833,7 +9833,7 @@ batteryBankNumberOfFuses  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fuses installed in battery bank."
 	::= { batteryBankEntry 5 }
 
@@ -9841,7 +9841,7 @@ batteryBankNumberOfSymmetries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of symmetry measurements available in battery bank."
 	::= { batteryBankEntry 6 }
 
@@ -9849,7 +9849,7 @@ batteryBankTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryBankTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryBank 3 }
 
@@ -9857,9 +9857,9 @@ batteryBankTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	BatteryBankTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryBankIndex, 
+	INDEX { batteryBankIndex,
 		batteryTemperatureIndex }
 	::= { batteryBankTemperatureTable 1 }
 
@@ -9890,7 +9890,7 @@ batteryTemperatureIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the temperature input table.
 		The size of the table is defined by the batteryBankNumberOfTemp   "
 	::= { batteryBankTemperatureEntry 1 }
@@ -9920,7 +9920,7 @@ batteryTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery temperature monitor"
 	::= { batteryBankTemperatureEntry 2 }
 
@@ -9928,7 +9928,7 @@ batteryTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryBankTemperatureEntry 3 }
@@ -9937,9 +9937,9 @@ batteryTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryBankTemperatureEntry 4 }
@@ -9951,7 +9951,7 @@ batteryTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryBankTemperatureEntry 5 }
 
@@ -9959,7 +9959,7 @@ batteryTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery temperature."
 	::= { batteryBankTemperatureEntry 6 }
 
@@ -9967,7 +9967,7 @@ batteryTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryBankTemperatureEntry 7 }
 
@@ -9975,7 +9975,7 @@ batteryTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryBankTemperatureEntry 8 }
 
@@ -9983,7 +9983,7 @@ batteryTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryBankTemperatureEntry 9 }
 
@@ -9991,7 +9991,7 @@ batteryTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryBankTemperatureEntry 10 }
 
@@ -9999,7 +9999,7 @@ batteryBankCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryBankCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryBank 4 }
 
@@ -10007,9 +10007,9 @@ batteryBankCurrentEntry  OBJECT-TYPE
 	SYNTAX 	BatteryBankCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryBankIndex, 
+	INDEX { batteryBankIndex,
 		batteryCurrentIndex }
 	::= { batteryBankCurrentTable 1 }
 
@@ -10040,7 +10040,7 @@ batteryCurrentIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the current input table.
 		        The size of the table is defined by the system"
 	::= { batteryBankCurrentEntry 1 }
@@ -10070,7 +10070,7 @@ batteryCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery current monitor"
 	::= { batteryBankCurrentEntry 2 }
 
@@ -10078,7 +10078,7 @@ batteryCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery current monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryBankCurrentEntry 3 }
@@ -10087,9 +10087,9 @@ batteryCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryBankCurrentEntry 4 }
@@ -10101,7 +10101,7 @@ batteryCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryBankCurrentEntry 5 }
 
@@ -10109,7 +10109,7 @@ batteryCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery current"
 	::= { batteryBankCurrentEntry 6 }
 
@@ -10117,7 +10117,7 @@ batteryCurrentMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryBankCurrentEntry 7 }
 
@@ -10125,7 +10125,7 @@ batteryCurrentMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryBankCurrentEntry 8 }
 
@@ -10133,7 +10133,7 @@ batteryCurrentMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryBankCurrentEntry 9 }
 
@@ -10141,7 +10141,7 @@ batteryCurrentMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryBankCurrentEntry 10 }
 
@@ -10149,7 +10149,7 @@ batteryBankFuseTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryBankFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryBank 5 }
 
@@ -10157,9 +10157,9 @@ batteryBankFuseEntry  OBJECT-TYPE
 	SYNTAX 	BatteryBankFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryBankIndex, 
+	INDEX { batteryBankIndex,
 		batteryFuseIndex }
 	::= { batteryBankFuseTable 1 }
 
@@ -10182,7 +10182,7 @@ batteryFuseIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the fuse table.
 		        The size of the table is defined by the system"
 	::= { batteryBankFuseEntry 1 }
@@ -10212,7 +10212,7 @@ batteryFuseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery fuse monitor"
 	::= { batteryBankFuseEntry 2 }
 
@@ -10220,7 +10220,7 @@ batteryFuseDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery fuse monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { batteryBankFuseEntry 3 }
@@ -10229,9 +10229,9 @@ batteryFuseTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryBankFuseEntry 4 }
@@ -10243,7 +10243,7 @@ batteryFuseAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryBankFuseEntry 5 }
 
@@ -10251,7 +10251,7 @@ batteryFuseValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of battery fuse input."
 	::= { batteryBankFuseEntry 6 }
 
@@ -10259,7 +10259,7 @@ batteryBankSymmetryTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryBankSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryBank 6 }
 
@@ -10267,9 +10267,9 @@ batteryBankSymmetryEntry  OBJECT-TYPE
 	SYNTAX 	BatteryBankSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryBankIndex, 
+	INDEX { batteryBankIndex,
 		batteryBankSymmetryIndex }
 	::= { batteryBankSymmetryTable 1 }
 
@@ -10298,7 +10298,7 @@ batteryBankSymmetryIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the symmetry input table.
 		The size of the table is defined by the batteryMonitorNumberOfSymmetries"
 	::= { batteryBankSymmetryEntry 1 }
@@ -10328,7 +10328,7 @@ batteryBankSymmetryStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery symmetry monitor"
 	::= { batteryBankSymmetryEntry 2 }
 
@@ -10336,7 +10336,7 @@ batteryBankSymmetryDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor symmetry. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryBankSymmetryEntry 3 }
@@ -10345,9 +10345,9 @@ batteryBankSymmetryTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryBankSymmetryEntry 4 }
@@ -10359,7 +10359,7 @@ batteryBankSymmetryAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryBankSymmetryEntry 5 }
 
@@ -10367,7 +10367,7 @@ batteryBankSymmetryMeasureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry voltage in battery monitor."
 	::= { batteryBankSymmetryEntry 6 }
 
@@ -10375,7 +10375,7 @@ batteryBankSymmetryDeltaValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry delta voltage in battery monitor."
 	::= { batteryBankSymmetryEntry 7 }
 
@@ -10383,7 +10383,7 @@ batteryBankSymmetryMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryBankSymmetryEntry 8 }
 
@@ -10391,7 +10391,7 @@ batteryBankSymmetryMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryBankSymmetryEntry 9 }
 
@@ -10399,7 +10399,7 @@ batteryMonitorsNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of battery monitor installed in system."
 	::= { batteryMonitors 1 }
 
@@ -10407,7 +10407,7 @@ batteryMonitorsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryMonitors 2 }
 
@@ -10415,7 +10415,7 @@ batteryMonitorsEntry  OBJECT-TYPE
 	SYNTAX 	BatteryMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryMonitorIndex }
 	::= { batteryMonitorsTable 1 }
@@ -10437,7 +10437,7 @@ batteryMonitorIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..8  of batteryMonitorsTable"
 	::= { batteryMonitorsEntry 1 }
 
@@ -10445,7 +10445,7 @@ batteryMonitorNumberOfTemperatures  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of temperature measurements in battery monitor."
 	::= { batteryMonitorsEntry 2 }
 
@@ -10453,7 +10453,7 @@ batteryMonitorNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of current measurements in battery monitor."
 	::= { batteryMonitorsEntry 3 }
 
@@ -10461,7 +10461,7 @@ batteryMonitorNumberOfFuses  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of fuse measurements in battery monitor."
 	::= { batteryMonitorsEntry 4 }
 
@@ -10469,7 +10469,7 @@ batteryMonitorNumberOfSymmetries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of symmetry measurements in battery monitor."
 	::= { batteryMonitorsEntry 5 }
 
@@ -10477,7 +10477,7 @@ batteryMonitorTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryMonitorTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryMonitors 3 }
 
@@ -10485,9 +10485,9 @@ batteryMonitorTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	BatteryMonitorTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryMonitorIndex, 
+	INDEX { batteryMonitorIndex,
 		batteryMonitorTemperatureIndex }
 	::= { batteryMonitorTemperatureTable 1 }
 
@@ -10518,7 +10518,7 @@ batteryMonitorTemperatureIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the temperature input table.
 		The size of the table is defined by the batteryMonitorNumberOfTemperatures"
 	::= { batteryMonitorTemperatureEntry 1 }
@@ -10548,7 +10548,7 @@ batteryMonitorTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery temperature monitor"
 	::= { batteryMonitorTemperatureEntry 2 }
 
@@ -10556,7 +10556,7 @@ batteryMonitorTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor temperature. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryMonitorTemperatureEntry 3 }
@@ -10565,9 +10565,9 @@ batteryMonitorTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryMonitorTemperatureEntry 4 }
@@ -10579,7 +10579,7 @@ batteryMonitorTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryMonitorTemperatureEntry 5 }
 
@@ -10587,7 +10587,7 @@ batteryMonitorTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery temperature in battery monitor."
 	::= { batteryMonitorTemperatureEntry 6 }
 
@@ -10595,7 +10595,7 @@ batteryMonitorTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryMonitorTemperatureEntry 7 }
 
@@ -10603,7 +10603,7 @@ batteryMonitorTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryMonitorTemperatureEntry 8 }
 
@@ -10611,7 +10611,7 @@ batteryMonitorTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryMonitorTemperatureEntry 9 }
 
@@ -10619,7 +10619,7 @@ batteryMonitorTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryMonitorTemperatureEntry 10 }
 
@@ -10627,7 +10627,7 @@ batteryMonitorCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryMonitors 4 }
 
@@ -10635,9 +10635,9 @@ batteryMonitorCurrentEntry  OBJECT-TYPE
 	SYNTAX 	BatteryMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryMonitorIndex, 
+	INDEX { batteryMonitorIndex,
 		batteryMonitorCurrentIndex }
 	::= { batteryMonitorCurrentTable 1 }
 
@@ -10668,7 +10668,7 @@ batteryMonitorCurrentIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the current input table.
 		The size of the table is defined by the batteryMonitorNumberOfCurrents"
 	::= { batteryMonitorCurrentEntry 1 }
@@ -10698,7 +10698,7 @@ batteryMonitorCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery current monitor"
 	::= { batteryMonitorCurrentEntry 2 }
 
@@ -10706,7 +10706,7 @@ batteryMonitorCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor current. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryMonitorCurrentEntry 3 }
@@ -10715,9 +10715,9 @@ batteryMonitorCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryMonitorCurrentEntry 4 }
@@ -10729,7 +10729,7 @@ batteryMonitorCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryMonitorCurrentEntry 5 }
 
@@ -10737,7 +10737,7 @@ batteryMonitorCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery current in battery monitor."
 	::= { batteryMonitorCurrentEntry 6 }
 
@@ -10745,7 +10745,7 @@ batteryMonitorCurrentMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryMonitorCurrentEntry 7 }
 
@@ -10753,7 +10753,7 @@ batteryMonitorCurrentMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryMonitorCurrentEntry 8 }
 
@@ -10761,7 +10761,7 @@ batteryMonitorCurrentMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryMonitorCurrentEntry 9 }
 
@@ -10769,7 +10769,7 @@ batteryMonitorCurrentMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryMonitorCurrentEntry 10 }
 
@@ -10777,7 +10777,7 @@ batteryMonitorFuseTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryMonitorFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryMonitors 5 }
 
@@ -10785,9 +10785,9 @@ batteryMonitorFuseEntry  OBJECT-TYPE
 	SYNTAX 	BatteryMonitorFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryMonitorIndex, 
+	INDEX { batteryMonitorIndex,
 		batteryMonitorFuseIndex }
 	::= { batteryMonitorFuseTable 1 }
 
@@ -10810,7 +10810,7 @@ batteryMonitorFuseIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the fuse table.
 		The size of the table is defined by the batteryMonitorNumberOfFuses"
 	::= { batteryMonitorFuseEntry 1 }
@@ -10840,7 +10840,7 @@ batteryMonitorFuseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery fuse monitor"
 	::= { batteryMonitorFuseEntry 2 }
 
@@ -10848,7 +10848,7 @@ batteryMonitorFuseDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor fuse. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryMonitorFuseEntry 3 }
@@ -10857,9 +10857,9 @@ batteryMonitorFuseTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryMonitorFuseEntry 4 }
@@ -10871,7 +10871,7 @@ batteryMonitorFuseAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryMonitorFuseEntry 5 }
 
@@ -10879,7 +10879,7 @@ batteryMonitorFuseValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of battery fuse in battery monitor."
 	::= { batteryMonitorFuseEntry 6 }
 
@@ -10887,7 +10887,7 @@ batteryMonitorSymmetryTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryMonitorSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryMonitors 6 }
 
@@ -10895,9 +10895,9 @@ batteryMonitorSymmetryEntry  OBJECT-TYPE
 	SYNTAX 	BatteryMonitorSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { batteryMonitorIndex, 
+	INDEX { batteryMonitorIndex,
 		batteryMonitorSymmetryIndex }
 	::= { batteryMonitorSymmetryTable 1 }
 
@@ -10926,7 +10926,7 @@ batteryMonitorSymmetryIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the symmetry input table.
 		The size of the table is defined by the batteryMonitorNumberOfSymmetries"
 	::= { batteryMonitorSymmetryEntry 1 }
@@ -10956,7 +10956,7 @@ batteryMonitorSymmetryStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery symmetry monitor"
 	::= { batteryMonitorSymmetryEntry 2 }
 
@@ -10964,7 +10964,7 @@ batteryMonitorSymmetryDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor symmetry. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryMonitorSymmetryEntry 3 }
@@ -10973,9 +10973,9 @@ batteryMonitorSymmetryTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryMonitorSymmetryEntry 4 }
@@ -10987,7 +10987,7 @@ batteryMonitorSymmetryAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryMonitorSymmetryEntry 5 }
 
@@ -10995,7 +10995,7 @@ batteryMonitorSymmetryMeasureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry voltage in battery monitor."
 	::= { batteryMonitorSymmetryEntry 6 }
 
@@ -11003,7 +11003,7 @@ batteryMonitorSymmetryDeltaValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry delta voltage in battery monitor."
 	::= { batteryMonitorSymmetryEntry 7 }
 
@@ -11011,7 +11011,7 @@ batteryMonitorSymmetryMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryMonitorSymmetryEntry 8 }
 
@@ -11019,7 +11019,7 @@ batteryMonitorSymmetryMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryMonitorSymmetryEntry 9 }
 
@@ -11027,7 +11027,7 @@ batteryEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered to/from battery."
 	::= { batteryEnergyLog 1 }
 
@@ -11035,7 +11035,7 @@ batteryEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery hourly energy log."
 	::= { batteryEnergyLog 2 }
 
@@ -11043,7 +11043,7 @@ batteryEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of battery."
 	::= { batteryEnergyLog 3 }
 
@@ -11051,7 +11051,7 @@ batteryEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	BatteryEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryEnergyLogLastHoursIndex }
 	::= { batteryEnergyLogLastHoursTable 1 }
@@ -11067,7 +11067,7 @@ batteryEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastHoursTable"
 	::= { batteryEnergyLogLastHoursEntry 1 }
 
@@ -11075,7 +11075,7 @@ batteryEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { batteryEnergyLogLastHoursEntry 2 }
 
@@ -11083,7 +11083,7 @@ batteryEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery daily energy log."
 	::= { batteryEnergyLog 4 }
 
@@ -11091,7 +11091,7 @@ batteryEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of battery."
 	::= { batteryEnergyLog 5 }
 
@@ -11099,7 +11099,7 @@ batteryEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	BatteryEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryEnergyLogLastDaysIndex }
 	::= { batteryEnergyLogLastDaysTable 1 }
@@ -11115,7 +11115,7 @@ batteryEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastDaysTable"
 	::= { batteryEnergyLogLastDaysEntry 1 }
 
@@ -11123,7 +11123,7 @@ batteryEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { batteryEnergyLogLastDaysEntry 2 }
 
@@ -11131,7 +11131,7 @@ batteryEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery weekly energy log."
 	::= { batteryEnergyLog 6 }
 
@@ -11139,7 +11139,7 @@ batteryEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of battery."
 	::= { batteryEnergyLog 7 }
 
@@ -11147,7 +11147,7 @@ batteryEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	BatteryEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryEnergyLogLastWeeksIndex }
 	::= { batteryEnergyLogLastWeeksTable 1 }
@@ -11163,7 +11163,7 @@ batteryEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastWeekTable"
 	::= { batteryEnergyLogLastWeeksEntry 1 }
 
@@ -11171,7 +11171,7 @@ batteryEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { batteryEnergyLogLastWeeksEntry 2 }
 
@@ -11179,7 +11179,7 @@ batteryCycleLogTotalCycles  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total number of battery discharge cycles."
 	::= { batteryCycleLog 1 }
 
@@ -11187,7 +11187,7 @@ batteryCycleLogDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily battery discharge cycle log."
 	::= { batteryCycleLog 2 }
 
@@ -11195,7 +11195,7 @@ batteryCycleLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryCycleLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily battery discharge cycle log."
 	::= { batteryCycleLog 3 }
 
@@ -11203,7 +11203,7 @@ batteryCycleLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	BatteryCycleLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryCycleLogDaysIndex }
 	::= { batteryCycleLogDaysTable 1 }
@@ -11219,7 +11219,7 @@ batteryCycleLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastDaysTable"
 	::= { batteryCycleLogDaysEntry 1 }
 
@@ -11227,7 +11227,7 @@ batteryCycleLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every day."
 	::= { batteryCycleLogDaysEntry 2 }
 
@@ -11235,7 +11235,7 @@ batteryCycleLogWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weeky battery discharge cycle log."
 	::= { batteryCycleLog 4 }
 
@@ -11243,7 +11243,7 @@ batteryCycleLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryCycleLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly battery discharge cycle log."
 	::= { batteryCycleLog 5 }
 
@@ -11251,7 +11251,7 @@ batteryCycleLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	BatteryCycleLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryCycleLogWeeksIndex }
 	::= { batteryCycleLogWeeksTable 1 }
@@ -11267,7 +11267,7 @@ batteryCycleLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastWeeksTable"
 	::= { batteryCycleLogWeeksEntry 1 }
 
@@ -11275,7 +11275,7 @@ batteryCycleLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every week."
 	::= { batteryCycleLogWeeksEntry 2 }
 
@@ -11283,7 +11283,7 @@ batteryCycleLogMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly battery discharge cycle log."
 	::= { batteryCycleLog 6 }
 
@@ -11291,7 +11291,7 @@ batteryCycleLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryCycleLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly battery discharge cycle log."
 	::= { batteryCycleLog 7 }
 
@@ -11299,7 +11299,7 @@ batteryCycleLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	BatteryCycleLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryCycleLogMonthsIndex }
 	::= { batteryCycleLogMonthsTable 1 }
@@ -11315,7 +11315,7 @@ batteryCycleLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastMonthTable"
 	::= { batteryCycleLogMonthsEntry 1 }
 
@@ -11323,7 +11323,7 @@ batteryCycleLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every month."
 	::= { batteryCycleLogMonthsEntry 2 }
 
@@ -11331,7 +11331,7 @@ batteryEqualizeVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (870..60418)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Voltage at which the DC System equalize charges the batteries."
 	::= { batteryEqualize 1 }
 
@@ -11343,7 +11343,7 @@ batteryEqualizeCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery equalize if the system allows it."
 	::= { batteryEqualize 2 }
 
@@ -11351,7 +11351,7 @@ batteryEqualizeCurrentThreshold  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The equalizing will terminate when the charge current drops below the EqualizeCurrentThreshold limit."
 	::= { batteryEqualize 3 }
 
@@ -11359,8 +11359,8 @@ batteryEqualizeManualMaxDuration  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"A protection against overcharging.  
+	DESCRIPTION
+		"A protection against overcharging.
 		When running manual equalize, the boosting will always terminate at this point.  "
 	::= { batteryEqualize 4 }
 
@@ -11389,7 +11389,7 @@ batteryAhChargedStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery ah charged monitor."
 	::= { batteryAhCharged 1 }
 
@@ -11397,7 +11397,7 @@ batteryAhChargedDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery ah charged monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryAhCharged 2 }
@@ -11406,9 +11406,9 @@ batteryAhChargedTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryAhCharged 3 }
@@ -11420,7 +11420,7 @@ batteryAhChargedAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryAhCharged 4 }
 
@@ -11428,7 +11428,7 @@ batteryAhChargedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery ah (x100) charged value."
 	::= { batteryAhCharged 5 }
 
@@ -11436,7 +11436,7 @@ batteryAhChargedMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryAhCharged 6 }
 
@@ -11444,7 +11444,7 @@ batteryAhChargedMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryAhCharged 7 }
 
@@ -11473,7 +11473,7 @@ batteryAhDischargedStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery ah discharged monitor."
 	::= { batteryAhDischarged 1 }
 
@@ -11481,7 +11481,7 @@ batteryAhDischargedDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery ah discharged monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryAhDischarged 2 }
@@ -11490,9 +11490,9 @@ batteryAhDischargedTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryAhDischarged 3 }
@@ -11504,7 +11504,7 @@ batteryAhDischargedAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryAhDischarged 4 }
 
@@ -11512,7 +11512,7 @@ batteryAhDischargedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery ah (x100) discharged value."
 	::= { batteryAhDischarged 5 }
 
@@ -11520,7 +11520,7 @@ batteryAhDischargedMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryAhDischarged 6 }
 
@@ -11528,7 +11528,7 @@ batteryAhDischargedMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryAhDischarged 7 }
 
@@ -11536,7 +11536,7 @@ batteryRunTimeAccumulated  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated running time of battery in hours."
 	::= { batteryRunTimeLog 1 }
 
@@ -11544,7 +11544,7 @@ batteryRunTimeLogDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily battery run time log."
 	::= { batteryRunTimeLog 2 }
 
@@ -11552,7 +11552,7 @@ batteryRunTimeLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryRunTimeLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily battery run time log."
 	::= { batteryRunTimeLog 3 }
 
@@ -11560,7 +11560,7 @@ batteryRunTimeLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	BatteryRunTimeLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryRunTimeLogDaysIndex }
 	::= { batteryRunTimeLogDaysTable 1 }
@@ -11576,7 +11576,7 @@ batteryRunTimeLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryRunTimeLogDaysTable"
 	::= { batteryRunTimeLogDaysEntry 1 }
 
@@ -11584,7 +11584,7 @@ batteryRunTimeLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery running minutes logged every day."
 	::= { batteryRunTimeLogDaysEntry 2 }
 
@@ -11592,7 +11592,7 @@ batteryRunTimeLogWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weeky battery run time log."
 	::= { batteryRunTimeLog 4 }
 
@@ -11600,7 +11600,7 @@ batteryRunTimeLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryRunTimeLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly battery run time log."
 	::= { batteryRunTimeLog 5 }
 
@@ -11608,7 +11608,7 @@ batteryRunTimeLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	BatteryRunTimeLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryRunTimeLogWeeksIndex }
 	::= { batteryRunTimeLogWeeksTable 1 }
@@ -11624,7 +11624,7 @@ batteryRunTimeLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryRunTimeLogWeeksTable"
 	::= { batteryRunTimeLogWeeksEntry 1 }
 
@@ -11632,7 +11632,7 @@ batteryRunTimeLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery running hours logged every week."
 	::= { batteryRunTimeLogWeeksEntry 2 }
 
@@ -11640,7 +11640,7 @@ batteryRunTimeLogMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly battery run time log."
 	::= { batteryRunTimeLog 6 }
 
@@ -11648,7 +11648,7 @@ batteryRunTimeLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryRunTimeLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly battery run time log."
 	::= { batteryRunTimeLog 7 }
 
@@ -11656,7 +11656,7 @@ batteryRunTimeLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	BatteryRunTimeLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryRunTimeLogMonthsIndex }
 	::= { batteryRunTimeLogMonthsTable 1 }
@@ -11672,7 +11672,7 @@ batteryRunTimeLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryRunTimeLogMonthsTable"
 	::= { batteryRunTimeLogMonthsEntry 1 }
 
@@ -11680,7 +11680,7 @@ batteryRunTimeLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery running hours logged every month."
 	::= { batteryRunTimeLogMonthsEntry 2 }
 
@@ -11688,7 +11688,7 @@ batteryModuleNoOfBatteryModules  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of battery modules installed"
 	::= { batteryModule 1 }
 
@@ -11717,7 +11717,7 @@ batteryModuleErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { batteryModuleError 1 }
 
@@ -11725,7 +11725,7 @@ batteryModuleErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryModuleError 2 }
@@ -11734,9 +11734,9 @@ batteryModuleErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryModuleError 3 }
@@ -11748,7 +11748,7 @@ batteryModuleErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryModuleError 4 }
 
@@ -11756,7 +11756,7 @@ batteryModuleErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed batteries."
 	::= { batteryModuleError 5 }
 
@@ -11764,7 +11764,7 @@ batteryModuleErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryModuleError 6 }
 
@@ -11772,7 +11772,7 @@ batteryModuleErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryModuleError 7 }
 
@@ -11801,7 +11801,7 @@ batteryModuleCommErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { batteryModuleCommError 1 }
 
@@ -11809,7 +11809,7 @@ batteryModuleCommErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery comm error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryModuleCommError 2 }
@@ -11818,9 +11818,9 @@ batteryModuleCommErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryModuleCommError 3 }
@@ -11832,7 +11832,7 @@ batteryModuleCommErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryModuleCommError 4 }
 
@@ -11840,7 +11840,7 @@ batteryModuleCommErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of batteries in comm error."
 	::= { batteryModuleCommError 5 }
 
@@ -11848,7 +11848,7 @@ batteryModuleCommErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryModuleCommError 6 }
 
@@ -11856,7 +11856,7 @@ batteryModuleCommErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryModuleCommError 7 }
 
@@ -11864,7 +11864,7 @@ batteryModuleTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryModuleEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Information of individule battery module"
 	::= { batteryModule 4 }
 
@@ -11872,7 +11872,7 @@ batteryModuleEntry  OBJECT-TYPE
 	SYNTAX 	BatteryModuleEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryModuleIndex }
 	::= { batteryModuleTable 1 }
@@ -11924,7 +11924,7 @@ batteryModuleIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100  of batteryModuleTable "
 	::= { batteryModuleEntry 1 }
 
@@ -11953,7 +11953,7 @@ batteryModuleStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		" The status value for the battery module"
 	::= { batteryModuleEntry 2 }
 
@@ -11961,7 +11961,7 @@ batteryModuleBatteryVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery voltage value"
 	::= { batteryModuleEntry 3 }
 
@@ -11969,7 +11969,7 @@ batteryModuleBatteryCurrent  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery current value"
 	::= { batteryModuleEntry 4 }
 
@@ -11977,7 +11977,7 @@ batteryModuleBatteryRemCap  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery remaining capacity value"
 	::= { batteryModuleEntry 5 }
 
@@ -11985,7 +11985,7 @@ batteryModuleBatteryTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery temperature value"
 	::= { batteryModuleEntry 6 }
 
@@ -11993,7 +11993,7 @@ batteryModuleBatteryQuality  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery quality value "
 	::= { batteryModuleEntry 7 }
 
@@ -12001,7 +12001,7 @@ batteryModuleMaxChargeCurrent  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Maximal charging current in Amp"
 	::= { batteryModuleEntry 8 }
 
@@ -12009,7 +12009,7 @@ batteryModuleMaxDischargeCurrent  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Maximal discharge current in Amp"
 	::= { batteryModuleEntry 9 }
 
@@ -12017,7 +12017,7 @@ batteryModuleBatteryMode  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery mode"
 	::= { batteryModuleEntry 10 }
 
@@ -12025,7 +12025,7 @@ batteryModuleChargeMode  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Charge mode"
 	::= { batteryModuleEntry 11 }
 
@@ -12033,7 +12033,7 @@ batteryModuleManufacturer  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery manufaturer"
 	::= { batteryModuleEntry 12 }
 
@@ -12041,7 +12041,7 @@ batteryModulePartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Part number"
 	::= { batteryModuleEntry 13 }
 
@@ -12049,7 +12049,7 @@ batteryModuleSerialNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Serial number"
 	::= { batteryModuleEntry 14 }
 
@@ -12057,7 +12057,7 @@ batteryModuleSoftwareVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Software version"
 	::= { batteryModuleEntry 15 }
 
@@ -12065,7 +12065,7 @@ batteryModuleProductionDate  OBJECT-TYPE
 	SYNTAX     DateAndTime (SIZE(8..11))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Date of production"
 	::= { batteryModuleEntry 16 }
 
@@ -12073,7 +12073,7 @@ batteryModuleAccumulatedAhCharged  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Accumulated Ah charged"
 	::= { batteryModuleEntry 17 }
 
@@ -12081,7 +12081,7 @@ batteryModuleAccumulatedAhDischarged  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Accumulated Ah discharged"
 	::= { batteryModuleEntry 18 }
 
@@ -12089,7 +12089,7 @@ batteryModuleNoOfChargeCycles  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of charge cycles"
 	::= { batteryModuleEntry 19 }
 
@@ -12097,7 +12097,7 @@ batteryModuleNoOfDischargeCycles  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles"
 	::= { batteryModuleEntry 20 }
 
@@ -12107,7 +12107,7 @@ inputControlUnitsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF InputControlUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { inputs 1 }
 
@@ -12115,7 +12115,7 @@ inputControlUnitsEntry  OBJECT-TYPE
 	SYNTAX 	InputControlUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { inputControlUnitIndex }
 	::= { inputControlUnitsTable 1 }
@@ -12131,7 +12131,7 @@ inputControlUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of inputControlUnitTable
 		The size of the table is defined by the system  "
 	::= { inputControlUnitsEntry 1 }
@@ -12140,7 +12140,7 @@ inputControlUnitNumberOfInputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of programmable inputs available in controller."
 	::= { inputControlUnitsEntry 2 }
 
@@ -12150,7 +12150,7 @@ inputControlUnitInputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF InputControlUnitInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the status of the programmable inputs for Control Units.
 		"
 	::= { inputs 2 }
@@ -12159,9 +12159,9 @@ inputControlUnitInputEntry  OBJECT-TYPE
 	SYNTAX 	InputControlUnitInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { inputControlUnitIndex, 
+	INDEX { inputControlUnitIndex,
 		inputControlUnitInputIndex }
 	::= { inputControlUnitInputTable 1 }
 
@@ -12186,7 +12186,7 @@ inputControlUnitInputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of inputControlUnitInputTable
 		The size of the table is defined by the inputControlUnitNumberOfInputs   "
 	::= { inputControlUnitInputEntry 1 }
@@ -12216,7 +12216,7 @@ inputControlUnitInputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Programmable input status.
 		"
 	::= { inputControlUnitInputEntry 2 }
@@ -12225,7 +12225,7 @@ inputControlUnitInputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the programmable input. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { inputControlUnitInputEntry 3 }
@@ -12234,9 +12234,9 @@ inputControlUnitInputTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { inputControlUnitInputEntry 4 }
@@ -12248,7 +12248,7 @@ inputControlUnitInputAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This will enable or disable this inputs Alarm functionality.
 		Setting 'disabled' here will turn off lock the status to 'disabled' state"
 	::= { inputControlUnitInputEntry 5 }
@@ -12257,12 +12257,12 @@ inputControlUnitInputValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The inputs measured Value. Depending on the type of input, this may
 		 represent a Voltage, a Temperature, a Current or a Boolean value.
-		Note: This value can only be set for virtual input on SP2 master or Smartpack S. 
-		When this value is set to '0', the input is deactivated; When this value is set to '1', 
-		the input is activated; 
+		Note: This value can only be set for virtual input on SP2 master or Smartpack S.
+		When this value is set to '0', the input is deactivated; When this value is set to '1',
+		the input is activated;
 		if set to any other value, an Inconsistent Value error
 		will be generated. "
 	::= { inputControlUnitInputEntry 6 }
@@ -12280,13 +12280,13 @@ inputControlUnitInputConfiguration  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Configuration of the input type. Configurations available for different controllers are as follows:
 		SP2 Basic(normally open, normally closed);
 		SP2 BasicInd(normally open,normally closed, temperature, temp 4-20mA, voltage);
-		Compack inputs 1-4(clock, virtual),inputs 5-7(normally open,normally closed, temperature, temp 4-20mA, voltage, clock); 
-		SmartpackS inputs 1-4(clock, virtual), inputs 5-8(normally open,normally closed,voltage,temperature,temp 4-20mA), 
-		inputs 9-10(normally open,normally closed,voltage); 
+		Compack inputs 1-4(clock, virtual),inputs 5-7(normally open,normally closed, temperature, temp 4-20mA, voltage, clock);
+		SmartpackS inputs 1-4(clock, virtual), inputs 5-8(normally open,normally closed,voltage,temperature,temp 4-20mA),
+		inputs 9-10(normally open,normally closed,voltage);
 		Smartpack R inputs 1-6(normally open,normally closed,diode matrix,clock, voltage),inputs 7-10(clock, virtual). "
 	::= { inputControlUnitInputEntry 7 }
 
@@ -12294,7 +12294,7 @@ inputIoUnitsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF InputIoUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { inputs 3 }
 
@@ -12302,7 +12302,7 @@ inputIoUnitsEntry  OBJECT-TYPE
 	SYNTAX 	InputIoUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { inputIoUnitIndex }
 	::= { inputIoUnitsTable 1 }
@@ -12318,7 +12318,7 @@ inputIoUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of inputIoUnitsTable
 		The size of the table is defined by the system  "
 	::= { inputIoUnitsEntry 1 }
@@ -12327,7 +12327,7 @@ inputIoUnitNumberOfInputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of programmable inputs available in IO unit."
 	::= { inputIoUnitsEntry 2 }
 
@@ -12335,23 +12335,23 @@ inputIoUnitProgInputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF InputIoUnitProgInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the status of the programmable inputs for I/O monitor units.
 		. "
 	::= { inputs 4 }
 
--- This branch contains OIDs related to the systems generic input subsystem. 
--- Here you will find info about the programmable inputs found in system controllers, 
+-- This branch contains OIDs related to the systems generic input subsystem.
+-- Here you will find info about the programmable inputs found in system controllers,
 -- I/O monitors and AC Mains Monitor units.
--- 
+--
 
 inputIoUnitProgInputEntry  OBJECT-TYPE
 	SYNTAX 	InputIoUnitProgInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { inputIoUnitIndex, 
+	INDEX { inputIoUnitIndex,
 		inputIoUnitProgInputIndex }
 	::= { inputIoUnitProgInputTable 1 }
 
@@ -12376,7 +12376,7 @@ inputIoUnitProgInputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..6)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Index to the Input of the selected I/O monitor unit.
 		Or the input number if you like."
 	::= { inputIoUnitProgInputEntry 1 }
@@ -12406,7 +12406,7 @@ inputIoUnitProgInputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Programmable input status.
 		"
 	::= { inputIoUnitProgInputEntry 2 }
@@ -12415,7 +12415,7 @@ inputIoUnitProgInputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the programmable input in IO unit. This is stored in the system controller
 		and can be changed by the user."
 	::= { inputIoUnitProgInputEntry 3 }
@@ -12424,9 +12424,9 @@ inputIoUnitProgInputTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { inputIoUnitProgInputEntry 4 }
@@ -12438,7 +12438,7 @@ inputIoUnitProgInputAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This will enable or disable this inputs Alarm functionality.
 		Setting 'disabled' here will turn off lock the status to 'disabled' state"
 	::= { inputIoUnitProgInputEntry 5 }
@@ -12447,7 +12447,7 @@ inputIoUnitProgInputValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The inputs measured Value. Depending on the type of input, this may
 		represent a Voltage, a Temperature, a Current or a Boolean value."
 	::= { inputIoUnitProgInputEntry 6 }
@@ -12462,11 +12462,11 @@ inputIoUnitProgInputConfiguration  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Configuration of the input type. Configurations available for IO unit are normally open,
-		normally closed, diode matrix, voltage and clock. Note: If an input is set to 'clock', it can 
+		normally closed, diode matrix, voltage and clock. Note: If an input is set to 'clock', it can
 		not be configurated to 'normally open', 'normally closed' and 'diode matrix' directly, it has
-		to be configurated to 'voltage' first. 
+		to be configurated to 'voltage' first.
 		"
 	::= { inputIoUnitProgInputEntry 7 }
 
@@ -12474,7 +12474,7 @@ outputControlUnitTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF OutputControlUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { outputs 1 }
 
@@ -12482,7 +12482,7 @@ outputControlUnitEntry  OBJECT-TYPE
 	SYNTAX 	OutputControlUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { outputControlUnitIndex }
 	::= { outputControlUnitTable 1 }
@@ -12498,7 +12498,7 @@ outputControlUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of outputControlUnitTable
 		The size of the table is defined by the system  "
 	::= { outputControlUnitEntry 1 }
@@ -12507,7 +12507,7 @@ outputControlUnitNumberOfOutputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of outputs available in controller."
 	::= { outputControlUnitEntry 2 }
 
@@ -12515,7 +12515,7 @@ outputControlUnitOutputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF OutputControlUnitOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the status of the outputs for Control Units."
 	::= { outputs 2 }
 
@@ -12523,9 +12523,9 @@ outputControlUnitOutputEntry  OBJECT-TYPE
 	SYNTAX 	OutputControlUnitOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { outputControlUnitIndex, 
+	INDEX { outputControlUnitIndex,
 		outputControlUnitOutputIndex }
 	::= { outputControlUnitOutputTable 1 }
 
@@ -12542,7 +12542,7 @@ outputControlUnitOutputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..16)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of outputControlUnitoutputTable
 		The size of the table is defined by the outputControlUnitNumberOfOutputs   "
 	::= { outputControlUnitOutputEntry 1 }
@@ -12556,11 +12556,11 @@ outputControlUnitOutputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"General output relays may be 'energized' or 'not energized'. 'energized' and 
-		'not energized' correspond 
+	DESCRIPTION
+		"General output relays may be 'energized' or 'not energized'. 'energized' and
+		'not energized' correspond
 		to normal and alarm condition respectively for normally
-		activated configuration. 
+		activated configuration.
 		Latched contactors may have values 'disconnected' or 'connected' "
 	::= { outputControlUnitOutputEntry 2 }
 
@@ -12568,7 +12568,7 @@ outputControlUnitOutputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the output. This is stored in the system controller
 		and can be changed by the user. "
 	::= { outputControlUnitOutputEntry 3 }
@@ -12577,7 +12577,7 @@ outputIoUnitTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF OutputIoUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { outputs 3 }
 
@@ -12585,7 +12585,7 @@ outputIoUnitEntry  OBJECT-TYPE
 	SYNTAX 	OutputIoUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { outputIoUnitIndex }
 	::= { outputIoUnitTable 1 }
@@ -12601,7 +12601,7 @@ outputIoUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of outputIoUnitTable
 		The size of the table is defined by the system  "
 	::= { outputIoUnitEntry 1 }
@@ -12610,7 +12610,7 @@ outputIoUnitNumberOfOutputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of outputs available in IO unit."
 	::= { outputIoUnitEntry 2 }
 
@@ -12618,7 +12618,7 @@ outputIoUnitOutputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF OutputIoUnitOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the status of the outputs for IO Units."
 	::= { outputs 4 }
 
@@ -12626,9 +12626,9 @@ outputIoUnitOutputEntry  OBJECT-TYPE
 	SYNTAX 	OutputIoUnitOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { outputIoUnitIndex, 
+	INDEX { outputIoUnitIndex,
 		outputIoUnitOutputIndex }
 	::= { outputIoUnitOutputTable 1 }
 
@@ -12645,7 +12645,7 @@ outputIoUnitOutputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of outputIOUnitOutputTable
 		The size of the table is defined by the outputIOUnitNumberOfOutputs "
 	::= { outputIoUnitOutputEntry 1 }
@@ -12659,8 +12659,8 @@ outputIoUnitOutputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"General output relays may be 'energized' or 'not energized'. 
+	DESCRIPTION
+		"General output relays may be 'energized' or 'not energized'.
 		Latched contactors may have values 'disconnected' or 'connected' "
 	::= { outputIoUnitOutputEntry 2 }
 
@@ -12668,7 +12668,7 @@ outputIoUnitOutputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the output in IO unit. This is stored in the system controller
 		and can be changed by the user. "
 	::= { outputIoUnitOutputEntry 3 }
@@ -12698,7 +12698,7 @@ controlSystemStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of control system subsystem"
 	::= { controlSystem 1 }
 
@@ -12706,7 +12706,7 @@ controlSystemClock  OBJECT-TYPE
 	SYNTAX     DateAndTime (SIZE(8..11))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the system time."
 	::= { controlSystem 2 }
 
@@ -12714,7 +12714,7 @@ controlSystemNumberOfControlUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Total number of main controllers (SP2 Master, SP2 Basic Ind, SP2 Basic, Compack, Smartpack S, Smartpack)"
 	::= { controlSystem 3 }
 
@@ -12725,7 +12725,7 @@ snmpSendOffTraps  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"When this is enabled, a trap is sent when a alarm condition goes off ."
 	::= { snmp 1 }
 
@@ -12733,8 +12733,8 @@ snmpTrapRepeatRate  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"The time between every repeated trap when an alarm condition is on. 
+	DESCRIPTION
+		"The time between every repeated trap when an alarm condition is on.
 		To turn repetetive traps off, set to zero.  Can be 0 to 1440 minutes i.e 24 hours."
 	::= { snmp 2 }
 
@@ -12742,8 +12742,8 @@ snmpHeartBeatTrapRepeatRate  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"The time between every heartbeat trap when an alarm condition is on. 
+	DESCRIPTION
+		"The time between every heartbeat trap when an alarm condition is on.
 		To turn heartbeat traps off, set to zero.  Can be 0 to 1440 minutes i.e 24 hours."
 	::= { snmp 3 }
 
@@ -12754,7 +12754,7 @@ snmpInhibitTraps  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"When this is enabled, no trap is sent regardless of alarm conditions.
 		"
 	::= { snmp 4 }
@@ -12766,7 +12766,7 @@ snmpResendTraps  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Resend traps once for all active alarms"
 	::= { snmp 5 }
 
@@ -12774,8 +12774,8 @@ snmpTrapsTargetAddressTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF SnmpTrapsTargetAddressEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
-		"This table shows the trap target address. Note that it is NOT allowed 
+	DESCRIPTION
+		"This table shows the trap target address. Note that it is NOT allowed
 		to change or create SNMP v3 trap target address IPs."
 	::= { snmp 6 }
 
@@ -12783,7 +12783,7 @@ snmpTrapsTargetAddressEntry  OBJECT-TYPE
 	SYNTAX 	SnmpTrapsTargetAddressEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { snmpTrapsTargetAddressIndex }
 	::= { snmpTrapsTargetAddressTable 1 }
@@ -12803,7 +12803,7 @@ snmpTrapsTargetAddressIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { snmpTrapsTargetAddressEntry 1 }
 
@@ -12811,8 +12811,8 @@ snmpTrapsTargetAddressIP  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..80))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"Note that it is only allowed 
+	DESCRIPTION
+		"Note that it is only allowed
 		to change or create SNMP v2c trap target address IPs."
 	::= { snmpTrapsTargetAddressEntry 2 }
 
@@ -12820,7 +12820,7 @@ snmpTrapsTargetAddressPort  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { snmpTrapsTargetAddressEntry 3 }
 
@@ -12833,7 +12833,7 @@ snmpTrapsTargetAddressVersion  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { snmpTrapsTargetAddressEntry 4 }
 
@@ -12844,7 +12844,7 @@ controlSystemResetManualAlarms  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Reset manual alarms and put buzzer into silence."
 	::= { controlSystem 5 }
 
@@ -12855,7 +12855,7 @@ controlSystemResetNumberOfModules  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"If set to '1', the number of modules (rectifier, solar charger, wind charger, control units, etc.)
 		will be reset, and only those modules communicating are counted."
 	::= { controlSystem 6 }
@@ -12864,7 +12864,7 @@ controlSystemIoUnitsNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (0..14)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of IO units installed in the system."
 	::= { controlSystemIoUnits 1 }
 
@@ -12872,7 +12872,7 @@ controlSystemIoUnitsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF ControlSystemIoUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { controlSystemIoUnits 2 }
 
@@ -12880,7 +12880,7 @@ controlSystemIoUnitsEntry  OBJECT-TYPE
 	SYNTAX 	ControlSystemIoUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { controlSystemIoUnitIndex }
 	::= { controlSystemIoUnitsTable 1 }
@@ -12898,7 +12898,7 @@ controlSystemIoUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of controlSystemIoUnitTable
 		The size of the table is defined by the system"
 	::= { controlSystemIoUnitsEntry 1 }
@@ -12907,7 +12907,7 @@ controlSystemIoUnitNumberOfTemperatures  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of temperature measurements available in IO unit"
 	::= { controlSystemIoUnitsEntry 2 }
 
@@ -12915,7 +12915,7 @@ controlSystemIoUnitNumberOfFans  OBJECT-TYPE
 	SYNTAX     Integer32 (0..4)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fan measurements available in IO unit"
 	::= { controlSystemIoUnitsEntry 3 }
 
@@ -12923,7 +12923,7 @@ controlSystemIoUnitTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF ControlSystemIoUnitTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { controlSystemIoUnits 3 }
 
@@ -12931,9 +12931,9 @@ controlSystemIoUnitTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	ControlSystemIoUnitTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { controlSystemIoUnitIndex, 
+	INDEX { controlSystemIoUnitIndex,
 		controlSystemIoUnitTemperatureIndex }
 	::= { controlSystemIoUnitTemperatureTable 1 }
 
@@ -12964,7 +12964,7 @@ controlSystemIoUnitTemperatureIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..2)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of controlSystemIoUnitTemperatureTable
 		The size of the table is defined by the controlSystemIoUnitNumberOfTemperatures"
 	::= { controlSystemIoUnitTemperatureEntry 1 }
@@ -12994,7 +12994,7 @@ controlSystemIoUnitTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of temperature monitor"
 	::= { controlSystemIoUnitTemperatureEntry 2 }
 
@@ -13002,7 +13002,7 @@ controlSystemIoUnitTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the temperature monitor in control system. This is stored in the system controller
 		and can be changed by the user."
 	::= { controlSystemIoUnitTemperatureEntry 3 }
@@ -13011,9 +13011,9 @@ controlSystemIoUnitTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { controlSystemIoUnitTemperatureEntry 4 }
@@ -13025,7 +13025,7 @@ controlSystemIoUnitTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { controlSystemIoUnitTemperatureEntry 5 }
 
@@ -13033,7 +13033,7 @@ controlSystemIoUnitTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured temperature value."
 	::= { controlSystemIoUnitTemperatureEntry 6 }
 
@@ -13041,7 +13041,7 @@ controlSystemIoUnitTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { controlSystemIoUnitTemperatureEntry 7 }
 
@@ -13049,7 +13049,7 @@ controlSystemIoUnitTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { controlSystemIoUnitTemperatureEntry 8 }
 
@@ -13057,7 +13057,7 @@ controlSystemIoUnitTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { controlSystemIoUnitTemperatureEntry 9 }
 
@@ -13065,7 +13065,7 @@ controlSystemIoUnitTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { controlSystemIoUnitTemperatureEntry 10 }
 
@@ -13073,7 +13073,7 @@ controlSystemIoUnitFanTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF ControlSystemIoUnitFanEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { controlSystemIoUnits 4 }
 
@@ -13081,9 +13081,9 @@ controlSystemIoUnitFanEntry  OBJECT-TYPE
 	SYNTAX 	ControlSystemIoUnitFanEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { controlSystemIoUnitIndex, 
+	INDEX { controlSystemIoUnitIndex,
 		controlSystemIoUnitFanIndex }
 	::= { controlSystemIoUnitFanTable 1 }
 
@@ -13102,7 +13102,7 @@ controlSystemIoUnitFanIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..2)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..2 of ioUnitFan Table"
 	::= { controlSystemIoUnitFanEntry 1 }
 
@@ -13110,7 +13110,7 @@ controlSystemIoUnitFanSpeedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured fan speed"
 	::= { controlSystemIoUnitFanEntry 2 }
 
@@ -13118,7 +13118,7 @@ controlSystemIoUnitFanSpeedDeviation  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured fan speed deviation"
 	::= { controlSystemIoUnitFanEntry 3 }
 
@@ -13126,7 +13126,7 @@ controlSystemIoUnitFanControl  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Fan speed control value in percentage"
 	::= { controlSystemIoUnitFanEntry 4 }
 
@@ -13134,7 +13134,7 @@ controlUnitNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (1..254)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Total number of control units installed in system."
 	::= { controlSystemInventory 1 }
 
@@ -13142,14 +13142,14 @@ controlUnitTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF ControlUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
-		"A table containing an inventory listing. Each row represent one of the system hardware 
-		unit that is connected to the can bus. These units are system controllers, 
-		battery monitors, I/O units, AC Mains Monitor boxes and load monitors.  Due to the system 
-		architechture the tables index are not contiguous. Each unit type har its own address 
-		range on the can bus.  All unit types except the system controller may contain 
+	DESCRIPTION
+		"A table containing an inventory listing. Each row represent one of the system hardware
+		unit that is connected to the can bus. These units are system controllers,
+		battery monitors, I/O units, AC Mains Monitor boxes and load monitors.  Due to the system
+		architechture the tables index are not contiguous. Each unit type har its own address
+		range on the can bus.  All unit types except the system controller may contain
 		from 0 to 14 units.  The system controlller can never be zero.  Then there is no powersystem.
-		
+
 		"
 	::= { controlSystemInventory 2 }
 
@@ -13157,7 +13157,7 @@ controlUnitEntry  OBJECT-TYPE
 	SYNTAX 	ControlUnitEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"One row  in the table containing all hardware units connected to the canbus.   "
 	INDEX { controlUnitIndex }
 	::= { controlUnitTable 1 }
@@ -13185,7 +13185,7 @@ controlUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..254)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of controlUnitTable
 		The size of the table is defined by the controlUnitNumberOfUnits   "
 	::= { controlUnitEntry 1 }
@@ -13194,7 +13194,7 @@ controlUnitDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the control unit"
 	::= { controlUnitEntry 2 }
 
@@ -13223,7 +13223,7 @@ controlUnitStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of the control unit."
 	::= { controlUnitEntry 3 }
 
@@ -13231,7 +13231,7 @@ controlUnitSerialNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Serial number of the control unit."
 	::= { controlUnitEntry 4 }
 
@@ -13239,7 +13239,7 @@ controlUnitHwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware part number of the control unit."
 	::= { controlUnitEntry 5 }
 
@@ -13247,7 +13247,7 @@ controlUnitHwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..20))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Hardware version of the control unit."
 	::= { controlUnitEntry 6 }
 
@@ -13255,7 +13255,7 @@ controlUnitSwPartNumber  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Software part number of the control unit."
 	::= { controlUnitEntry 7 }
 
@@ -13263,7 +13263,7 @@ controlUnitSwVersion  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..20))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Software version of the control unit."
 	::= { controlUnitEntry 8 }
 
@@ -13271,7 +13271,7 @@ currentMonitorsNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (0..14)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of current monitors installed in the system."
 	::= { currentMonitors 1 }
 
@@ -13279,7 +13279,7 @@ currentMonitorsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { currentMonitors 2 }
 
@@ -13287,7 +13287,7 @@ currentMonitorsEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { currentMonitorIndex }
 	::= { currentMonitorsTable 1 }
@@ -13309,7 +13309,7 @@ currentMonitorIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of currentMonitorsTable
 		The size of the table is defined by the system"
 	::= { currentMonitorsEntry 1 }
@@ -13326,8 +13326,8 @@ currentMonitorType  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"This shows if the current monitor is configured as standard load monitor (1), load current 
+	DESCRIPTION
+		"This shows if the current monitor is configured as standard load monitor (1), load current
 		monitor (2), rectifier current monitor (3), dcdc current monitor (4), solar current monitor (5),
 		wind current monitor (6) or fuel cell current monitor (7)."
 	::= { currentMonitorsEntry 2 }
@@ -13336,7 +13336,7 @@ currentMonitorId  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the unit index for each current monitor type."
 	::= { currentMonitorsEntry 3 }
 
@@ -13344,7 +13344,7 @@ currentMonitorNumberOfFuses  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fuse measurements in current monitor."
 	::= { currentMonitorsEntry 4 }
 
@@ -13352,7 +13352,7 @@ currentMonitorNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of current measurements in current monitor."
 	::= { currentMonitorsEntry 5 }
 
@@ -13360,7 +13360,7 @@ currentMonitorFuseTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { currentMonitors 3 }
 
@@ -13368,9 +13368,9 @@ currentMonitorFuseEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
+	INDEX { currentMonitorIndex,
 		currentMonitorFuseIndex }
 	::= { currentMonitorFuseTable 1 }
 
@@ -13393,7 +13393,7 @@ currentMonitorFuseIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of currentMonitorFuseTable
 		The size of the table is defined by the currentMonitorNumberOfFuses"
 	::= { currentMonitorFuseEntry 1 }
@@ -13423,7 +13423,7 @@ currentMonitorFuseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of fuse in current monitor"
 	::= { currentMonitorFuseEntry 2 }
 
@@ -13431,7 +13431,7 @@ currentMonitorFuseDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the fuse monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { currentMonitorFuseEntry 3 }
@@ -13440,9 +13440,9 @@ currentMonitorFuseTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { currentMonitorFuseEntry 4 }
@@ -13454,7 +13454,7 @@ currentMonitorFuseAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { currentMonitorFuseEntry 5 }
 
@@ -13462,7 +13462,7 @@ currentMonitorFuseValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured fuse value."
 	::= { currentMonitorFuseEntry 6 }
 
@@ -13470,7 +13470,7 @@ currentMonitorCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { currentMonitors 4 }
 
@@ -13478,9 +13478,9 @@ currentMonitorCurrentEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
+	INDEX { currentMonitorIndex,
 		currentMonitorCurrentIndex }
 	::= { currentMonitorCurrentTable 1 }
 
@@ -13507,7 +13507,7 @@ currentMonitorCurrentIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of currentMonitorCurrentTable
 		The size of the table is defined by the currentMonitorNumberOfCurrents"
 	::= { currentMonitorCurrentEntry 1 }
@@ -13537,7 +13537,7 @@ currentMonitorCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of current in current monitor"
 	::= { currentMonitorCurrentEntry 2 }
 
@@ -13545,7 +13545,7 @@ currentMonitorCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the current monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { currentMonitorCurrentEntry 3 }
@@ -13554,9 +13554,9 @@ currentMonitorCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { currentMonitorCurrentEntry 4 }
@@ -13568,7 +13568,7 @@ currentMonitorCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { currentMonitorCurrentEntry 5 }
 
@@ -13576,7 +13576,7 @@ currentMonitorCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured current value."
 	::= { currentMonitorCurrentEntry 6 }
 
@@ -13584,7 +13584,7 @@ currentMonitorCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { currentMonitorCurrentEntry 7 }
 
@@ -13592,7 +13592,7 @@ currentMonitorCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { currentMonitorCurrentEntry 8 }
 
@@ -13600,7 +13600,7 @@ currentMonitorEnergyLogAccumulatedTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the accumulated energy consumption measured in current monitor"
 	::= { currentMonitors 5 }
 
@@ -13608,9 +13608,9 @@ currentMonitorEnergyLogAccumulatedEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
+	INDEX { currentMonitorIndex,
 		currentMonitorCurrentIndex }
 	::= { currentMonitorEnergyLogAccumulatedTable 1 }
 
@@ -13623,7 +13623,7 @@ currentMonitorEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The accumulated energy consumption value"
 	::= { currentMonitorEnergyLogAccumulatedEntry 1 }
 
@@ -13631,7 +13631,7 @@ currentMonitorEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in hourly energy log"
 	::= { currentMonitors 6 }
 
@@ -13639,7 +13639,7 @@ currentMonitorEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every hour in current monitor."
 	::= { currentMonitors 7 }
 
@@ -13647,10 +13647,10 @@ currentMonitorEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
-		currentMonitorCurrentIndex, 
+	INDEX { currentMonitorIndex,
+		currentMonitorCurrentIndex,
 		currentMonitorEnergyLogLastHoursIndex }
 	::= { currentMonitorEnergyLogLastHoursTable 1 }
 
@@ -13665,7 +13665,7 @@ currentMonitorEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of currentMonitorEnergyLogLastHoursTable"
 	::= { currentMonitorEnergyLogLastHoursEntry 1 }
 
@@ -13673,7 +13673,7 @@ currentMonitorEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every hour in current monitor."
 	::= { currentMonitorEnergyLogLastHoursEntry 2 }
 
@@ -13681,7 +13681,7 @@ currentMonitorEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily energy log"
 	::= { currentMonitors 8 }
 
@@ -13689,7 +13689,7 @@ currentMonitorEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every day in current monitor."
 	::= { currentMonitors 9 }
 
@@ -13697,10 +13697,10 @@ currentMonitorEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
-		currentMonitorCurrentIndex, 
+	INDEX { currentMonitorIndex,
+		currentMonitorCurrentIndex,
 		currentMonitorEnergyLogLastDaysIndex }
 	::= { currentMonitorEnergyLogLastDaysTable 1 }
 
@@ -13715,7 +13715,7 @@ currentMonitorEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of currentMonitorEnergyLogLastDaysTable"
 	::= { currentMonitorEnergyLogLastDaysEntry 1 }
 
@@ -13723,7 +13723,7 @@ currentMonitorEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every day in current monitor."
 	::= { currentMonitorEnergyLogLastDaysEntry 2 }
 
@@ -13731,7 +13731,7 @@ currentMonitorEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly energy log"
 	::= { currentMonitors 10 }
 
@@ -13739,7 +13739,7 @@ currentMonitorEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF CurrentMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every week in current monitor."
 	::= { currentMonitors 11 }
 
@@ -13747,10 +13747,10 @@ currentMonitorEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	CurrentMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { currentMonitorIndex, 
-		currentMonitorCurrentIndex, 
+	INDEX { currentMonitorIndex,
+		currentMonitorCurrentIndex,
 		currentMonitorEnergyLogLastWeeksIndex }
 	::= { currentMonitorEnergyLogLastWeeksTable 1 }
 
@@ -13765,7 +13765,7 @@ currentMonitorEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of currentMonitorEnergyLogLastWeekTable"
 	::= { currentMonitorEnergyLogLastWeeksEntry 1 }
 
@@ -13773,7 +13773,7 @@ currentMonitorEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every week in current monitor."
 	::= { currentMonitorEnergyLogLastWeeksEntry 2 }
 
@@ -13781,7 +13781,7 @@ flexiMonitorsNumberOfUnits  OBJECT-TYPE
 	SYNTAX     Integer32 (0..14)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of fleximonitors installed in the system."
 	::= { flexiMonitors 1 }
 
@@ -13789,7 +13789,7 @@ flexiMonitorsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 2 }
 
@@ -13797,7 +13797,7 @@ flexiMonitorsEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { flexiMonitorIndex }
 	::= { flexiMonitorsTable 1 }
@@ -13821,7 +13821,7 @@ flexiMonitorIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of flexiMonitorsTable
 		The size of the table is defined by the system"
 	::= { flexiMonitorsEntry 1 }
@@ -13839,8 +13839,8 @@ flexiMonitorType  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"This shows if the fleximonitor is configured as battery monitor (1), load 
+	DESCRIPTION
+		"This shows if the fleximonitor is configured as battery monitor (1), load
 		monitor (2), rectifier monitor (3), controller monitor(4), dcdc monitor (5), solar monitor (6),
 		wind monitor (7) or fuel cell monitor 8)."
 	::= { flexiMonitorsEntry 2 }
@@ -13849,7 +13849,7 @@ flexiMonitorId  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the unit index for each fleximonitor type."
 	::= { flexiMonitorsEntry 3 }
 
@@ -13857,7 +13857,7 @@ flexiMonitorNumberOfInputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of inputs in fleximonitor."
 	::= { flexiMonitorsEntry 4 }
 
@@ -13865,7 +13865,7 @@ flexiMonitorNumberOfOutputs  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of outputs in fleximonitor."
 	::= { flexiMonitorsEntry 5 }
 
@@ -13873,7 +13873,7 @@ flexiMonitorNumberOfCurrentInputs  OBJECT-TYPE
 	SYNTAX     Integer32 (0..8)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of current inputs in fleximonitor."
 	::= { flexiMonitorsEntry 6 }
 
@@ -13881,7 +13881,7 @@ flexiMonitorInputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 3 }
 
@@ -13889,9 +13889,9 @@ flexiMonitorInputEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
+	INDEX { flexiMonitorIndex,
 		flexiMonitorInputIndex }
 	::= { flexiMonitorInputTable 1 }
 
@@ -13916,7 +13916,7 @@ flexiMonitorInputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..16)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of flexiMonitorInputTable
 		The size of the table is defined by the flexiMonitorNumberOfInputs"
 	::= { flexiMonitorInputEntry 1 }
@@ -13946,7 +13946,7 @@ flexiMonitorInputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Programmable input status.
 		"
 	::= { flexiMonitorInputEntry 2 }
@@ -13955,7 +13955,7 @@ flexiMonitorInputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the programmable input. This is stored in the system controller
 		and can be changed by the user.  ."
 	::= { flexiMonitorInputEntry 3 }
@@ -13964,9 +13964,9 @@ flexiMonitorInputTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { flexiMonitorInputEntry 4 }
@@ -13978,7 +13978,7 @@ flexiMonitorInputAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This will enable or disable this inputs Alarm functionality.
 		Setting 'disabled' here will turn off lock the status to 'disabled' state"
 	::= { flexiMonitorInputEntry 5 }
@@ -13987,7 +13987,7 @@ flexiMonitorInputValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The inputs measured Value. Depending on the type of input, this may
 		 represent a Voltage, a Temperature, a Current, a Speed or a Boolean value."
 	::= { flexiMonitorInputEntry 6 }
@@ -14009,7 +14009,7 @@ flexiMonitorInputConfiguration  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Configuration of the input type. Available configurations are: ProgIn-Normally Open(1), ProgIn-Normally Closed(2),
 		Voltage(3), Temperature(4),Current(5),Speed(6),Fuse-Normally Open(7),Fuse-Normally Closed(8), Fuse-Diode Matrix(9)
 		current4-20mA(10),temp4-20mA(11),percent4-20mA(12)."
@@ -14019,7 +14019,7 @@ flexiMonitorOutputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 4 }
 
@@ -14027,9 +14027,9 @@ flexiMonitorOutputEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorOutputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
+	INDEX { flexiMonitorIndex,
 		flexiMonitorOutputIndex }
 	::= { flexiMonitorOutputTable 1 }
 
@@ -14046,7 +14046,7 @@ flexiMonitorOutputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..16)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of flexiMonitorOutputTable
 		The size of the table is defined by the flexiMonitorNumberOfOutputs"
 	::= { flexiMonitorOutputEntry 1 }
@@ -14060,11 +14060,11 @@ flexiMonitorOutputStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"General output relays may be 'energized' or 'not energized'. 'energized' and 
-		'not energized' correspond 
+	DESCRIPTION
+		"General output relays may be 'energized' or 'not energized'. 'energized' and
+		'not energized' correspond
 		to normal and alarm condition respectively for normally
-		activated configuration. 
+		activated configuration.
 		Latched contactors may have values 'disconnected' or 'connected'"
 	::= { flexiMonitorOutputEntry 2 }
 
@@ -14072,7 +14072,7 @@ flexiMonitorOutputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the output. This is stored in the system controller
 		and can be changed by the user. "
 	::= { flexiMonitorOutputEntry 3 }
@@ -14081,7 +14081,7 @@ flexiMonitorCurrentInputTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorCurrentInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 5 }
 
@@ -14089,9 +14089,9 @@ flexiMonitorCurrentInputEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorCurrentInputEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
+	INDEX { flexiMonitorIndex,
 		flexiMonitorCurrentInputIndex }
 	::= { flexiMonitorCurrentInputTable 1 }
 
@@ -14110,7 +14110,7 @@ flexiMonitorCurrentInputIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..16)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows  of flexiMonitorInputTable
 		The size of the table is defined by the flexiMonitorNumberOfInputs"
 	::= { flexiMonitorCurrentInputEntry 1 }
@@ -14119,7 +14119,7 @@ flexiMonitorCurrentInputDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the programmable input. This is stored in the system controller
 		and can be changed by the user.  ."
 	::= { flexiMonitorCurrentInputEntry 2 }
@@ -14128,7 +14128,7 @@ flexiMonitorCurrentInputPricePerKW  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Price per kW. To be used together with energy cost logs."
 	::= { flexiMonitorCurrentInputEntry 3 }
 
@@ -14136,7 +14136,7 @@ flexiMonitorCurrentInputCurrency  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..6))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The currency used in energy cost logs."
 	::= { flexiMonitorCurrentInputEntry 4 }
 
@@ -14144,7 +14144,7 @@ flexiMonitorEnergyCostLogLastMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 6 }
 
@@ -14152,7 +14152,7 @@ flexiMonitorEnergyCostLogLastMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyCostLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 7 }
 
@@ -14160,10 +14160,10 @@ flexiMonitorEnergyCostLogLastMonthsEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyCostLogLastMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
-		flexiMonitorCurrentInputIndex, 
+	INDEX { flexiMonitorIndex,
+		flexiMonitorCurrentInputIndex,
 		flexiMonitorEnergyCostLogLastMonthsIndex }
 	::= { flexiMonitorEnergyCostLogLastMonthsTable 1 }
 
@@ -14182,7 +14182,7 @@ flexiMonitorEnergyCostLogLastMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..12"
 	::= { flexiMonitorEnergyCostLogLastMonthsEntry 1 }
 
@@ -14203,7 +14203,7 @@ flexiMonitorEnergyCostLogLastMonthsMonth  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index by month"
 	::= { flexiMonitorEnergyCostLogLastMonthsEntry 2 }
 
@@ -14211,7 +14211,7 @@ flexiMonitorEnergyCostLogLastMonthsEnergy  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy in kWh"
 	::= { flexiMonitorEnergyCostLogLastMonthsEntry 3 }
 
@@ -14219,7 +14219,7 @@ flexiMonitorEnergyCostLogLastMonthsCost  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy cost"
 	::= { flexiMonitorEnergyCostLogLastMonthsEntry 4 }
 
@@ -14227,7 +14227,7 @@ flexiMonitorEnergyCostLogLastYearsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 8 }
 
@@ -14235,7 +14235,7 @@ flexiMonitorEnergyCostLogLastYearsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyCostLogLastYearsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { flexiMonitors 9 }
 
@@ -14243,10 +14243,10 @@ flexiMonitorEnergyCostLogLastYearsEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyCostLogLastYearsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
-		flexiMonitorCurrentInputIndex, 
+	INDEX { flexiMonitorIndex,
+		flexiMonitorCurrentInputIndex,
 		flexiMonitorEnergyCostLogLastYearsIndex }
 	::= { flexiMonitorEnergyCostLogLastYearsTable 1 }
 
@@ -14265,7 +14265,7 @@ flexiMonitorEnergyCostLogLastYearsIndex  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..12"
 	::= { flexiMonitorEnergyCostLogLastYearsEntry 1 }
 
@@ -14273,7 +14273,7 @@ flexiMonitorEnergyCostLogLastYearsYear  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(4))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index by year"
 	::= { flexiMonitorEnergyCostLogLastYearsEntry 2 }
 
@@ -14281,7 +14281,7 @@ flexiMonitorEnergyCostLogLastYearsEnergy  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy in kWh"
 	::= { flexiMonitorEnergyCostLogLastYearsEntry 3 }
 
@@ -14289,7 +14289,7 @@ flexiMonitorEnergyCostLogLastYearsCost  OBJECT-TYPE
 	SYNTAX     DisplayString
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy cost"
 	::= { flexiMonitorEnergyCostLogLastYearsEntry 4 }
 
@@ -14297,7 +14297,7 @@ flexiMonitorEnergyLogAccumulatedTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the accumulated energy consumption measured in fleximonitor"
 	::= { flexiMonitors 10 }
 
@@ -14305,9 +14305,9 @@ flexiMonitorEnergyLogAccumulatedEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyLogAccumulatedEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
+	INDEX { flexiMonitorIndex,
 		flexiMonitorCurrentInputIndex }
 	::= { flexiMonitorEnergyLogAccumulatedTable 1 }
 
@@ -14320,7 +14320,7 @@ flexiMonitorEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The accumulated energy consumption value"
 	::= { flexiMonitorEnergyLogAccumulatedEntry 1 }
 
@@ -14328,7 +14328,7 @@ flexiMonitorEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in hourly energy log"
 	::= { flexiMonitors 11 }
 
@@ -14336,7 +14336,7 @@ flexiMonitorEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every hour in fleximonitor."
 	::= { flexiMonitors 12 }
 
@@ -14344,10 +14344,10 @@ flexiMonitorEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
-		flexiMonitorCurrentInputIndex, 
+	INDEX { flexiMonitorIndex,
+		flexiMonitorCurrentInputIndex,
 		flexiMonitorEnergyLogLastHoursIndex }
 	::= { flexiMonitorEnergyLogLastHoursTable 1 }
 
@@ -14362,7 +14362,7 @@ flexiMonitorEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of flexiMonitorEnergyLogLastHoursTable"
 	::= { flexiMonitorEnergyLogLastHoursEntry 1 }
 
@@ -14370,7 +14370,7 @@ flexiMonitorEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every hour in fleximonitor."
 	::= { flexiMonitorEnergyLogLastHoursEntry 2 }
 
@@ -14378,7 +14378,7 @@ flexiMonitorEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily energy log"
 	::= { flexiMonitors 13 }
 
@@ -14386,7 +14386,7 @@ flexiMonitorEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every day in fleximonitor."
 	::= { flexiMonitors 14 }
 
@@ -14394,10 +14394,10 @@ flexiMonitorEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
-		flexiMonitorCurrentInputIndex, 
+	INDEX { flexiMonitorIndex,
+		flexiMonitorCurrentInputIndex,
 		flexiMonitorEnergyLogLastDaysIndex }
 	::= { flexiMonitorEnergyLogLastDaysTable 1 }
 
@@ -14412,7 +14412,7 @@ flexiMonitorEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of flexiMonitorEnergyLogLastDaysTable"
 	::= { flexiMonitorEnergyLogLastDaysEntry 1 }
 
@@ -14420,7 +14420,7 @@ flexiMonitorEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every day in fleximonitor."
 	::= { flexiMonitorEnergyLogLastDaysEntry 2 }
 
@@ -14428,7 +14428,7 @@ flexiMonitorEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly energy log"
 	::= { flexiMonitors 15 }
 
@@ -14436,7 +14436,7 @@ flexiMonitorEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FlexiMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains energy consumption values logged every week in fleximonitor."
 	::= { flexiMonitors 16 }
 
@@ -14444,10 +14444,10 @@ flexiMonitorEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	FlexiMonitorEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { flexiMonitorIndex, 
-		flexiMonitorCurrentInputIndex, 
+	INDEX { flexiMonitorIndex,
+		flexiMonitorCurrentInputIndex,
 		flexiMonitorEnergyLogLastWeeksIndex }
 	::= { flexiMonitorEnergyLogLastWeeksTable 1 }
 
@@ -14462,7 +14462,7 @@ flexiMonitorEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of flexiMonitorEnergyLogLastWeeksTable"
 	::= { flexiMonitorEnergyLogLastWeeksEntry 1 }
 
@@ -14470,7 +14470,7 @@ flexiMonitorEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy consumption value logged every week in fleximonitor."
 	::= { flexiMonitorEnergyLogLastWeeksEntry 2 }
 
@@ -14478,7 +14478,7 @@ mainControlUnitsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainControlUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { mainControlUnits 1 }
 
@@ -14486,7 +14486,7 @@ mainControlUnitsEntry  OBJECT-TYPE
 	SYNTAX 	MainControlUnitsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainControlUnitIndex }
 	::= { mainControlUnitsTable 1 }
@@ -14502,7 +14502,7 @@ mainControlUnitIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of controlUnitTable
 		The size of the table is defined by the system"
 	::= { mainControlUnitsEntry 1 }
@@ -14511,7 +14511,7 @@ mainControlUnitNumberOfTemperatures  OBJECT-TYPE
 	SYNTAX     Integer32 (1..14)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Total number of temperature measurements in main controller"
 	::= { mainControlUnitsEntry 2 }
 
@@ -14519,7 +14519,7 @@ mainControlUnitTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainControlUnitTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { mainControlUnits 2 }
 
@@ -14527,9 +14527,9 @@ mainControlUnitTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	MainControlUnitTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { mainControlUnitIndex, 
+	INDEX { mainControlUnitIndex,
 		mainControlUnitTemperatureIndex }
 	::= { mainControlUnitTemperatureTable 1 }
 
@@ -14560,7 +14560,7 @@ mainControlUnitTemperatureIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the temperature input table.
 		The size of the table is defined by the batteryBankNumberOfTemp   "
 	::= { mainControlUnitTemperatureEntry 1 }
@@ -14590,7 +14590,7 @@ mainControlUnitTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery temperature monitor"
 	::= { mainControlUnitTemperatureEntry 2 }
 
@@ -14598,7 +14598,7 @@ mainControlUnitTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { mainControlUnitTemperatureEntry 3 }
@@ -14607,9 +14607,9 @@ mainControlUnitTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainControlUnitTemperatureEntry 4 }
@@ -14621,7 +14621,7 @@ mainControlUnitTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainControlUnitTemperatureEntry 5 }
 
@@ -14629,7 +14629,7 @@ mainControlUnitTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery temperature."
 	::= { mainControlUnitTemperatureEntry 6 }
 
@@ -14637,7 +14637,7 @@ mainControlUnitTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { mainControlUnitTemperatureEntry 7 }
 
@@ -14645,7 +14645,7 @@ mainControlUnitTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { mainControlUnitTemperatureEntry 8 }
 
@@ -14653,7 +14653,7 @@ mainControlUnitTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { mainControlUnitTemperatureEntry 9 }
 
@@ -14661,7 +14661,7 @@ mainControlUnitTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { mainControlUnitTemperatureEntry 10 }
 
@@ -14669,7 +14669,7 @@ mainControlUnitEarthFaultTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF MainControlUnitEarthFaultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { mainControlUnits 3 }
 
@@ -14677,7 +14677,7 @@ mainControlUnitEarthFaultEntry  OBJECT-TYPE
 	SYNTAX 	MainControlUnitEarthFaultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { mainControlUnitIndex }
 	::= { mainControlUnitEarthFaultTable 1 }
@@ -14722,7 +14722,7 @@ mainControlUnitEarthFaultStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the earth resistance is lower than the defined alarm level."
 	::= { mainControlUnitEarthFaultEntry 1 }
 
@@ -14730,7 +14730,7 @@ mainControlUnitEarthFaultDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the earth fault monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainControlUnitEarthFaultEntry 2 }
@@ -14739,9 +14739,9 @@ mainControlUnitEarthFaultTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainControlUnitEarthFaultEntry 3 }
@@ -14753,7 +14753,7 @@ mainControlUnitEarthFaultAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainControlUnitEarthFaultEntry 4 }
 
@@ -14761,7 +14761,7 @@ mainControlUnitEarthFaultValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the earth resistance in kOhm."
 	::= { mainControlUnitEarthFaultEntry 5 }
 
@@ -14769,7 +14769,7 @@ mainControlUnitEarthFaultMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { mainControlUnitEarthFaultEntry 6 }
 
@@ -14798,7 +14798,7 @@ mainControlUnitsErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed main controllers is higher than the defined alarm level."
 	::= { mainControlUnitsError 1 }
 
@@ -14806,7 +14806,7 @@ mainControlUnitsErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the main control units error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainControlUnitsError 2 }
@@ -14815,9 +14815,9 @@ mainControlUnitsErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainControlUnitsError 3 }
@@ -14829,7 +14829,7 @@ mainControlUnitsErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainControlUnitsError 4 }
 
@@ -14837,7 +14837,7 @@ mainControlUnitsErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed main controllers."
 	::= { mainControlUnitsError 5 }
 
@@ -14845,7 +14845,7 @@ mainControlUnitsErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { mainControlUnitsError 6 }
 
@@ -14853,7 +14853,7 @@ mainControlUnitsErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { mainControlUnitsError 7 }
 
@@ -14882,7 +14882,7 @@ smartNodeErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed smartnodes is higher than the defined alarm level."
 	::= { smartNodeError 1 }
 
@@ -14890,7 +14890,7 @@ smartNodeErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the smartnode error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { smartNodeError 2 }
@@ -14899,9 +14899,9 @@ smartNodeErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { smartNodeError 3 }
@@ -14913,7 +14913,7 @@ smartNodeErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { smartNodeError 4 }
 
@@ -14921,7 +14921,7 @@ smartNodeErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed smartnodes."
 	::= { smartNodeError 5 }
 
@@ -14929,7 +14929,7 @@ smartNodeErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { smartNodeError 6 }
 
@@ -14937,7 +14937,7 @@ smartNodeErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { smartNodeError 7 }
 
@@ -14966,7 +14966,7 @@ batteryMonitorErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed battery monitors is higher than the defined alarm level."
 	::= { batteryMonitorError 1 }
 
@@ -14974,7 +14974,7 @@ batteryMonitorErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { batteryMonitorError 2 }
@@ -14983,9 +14983,9 @@ batteryMonitorErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryMonitorError 3 }
@@ -14997,7 +14997,7 @@ batteryMonitorErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryMonitorError 4 }
 
@@ -15005,7 +15005,7 @@ batteryMonitorErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed battery monitors."
 	::= { batteryMonitorError 5 }
 
@@ -15013,7 +15013,7 @@ batteryMonitorErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryMonitorError 6 }
 
@@ -15021,7 +15021,7 @@ batteryMonitorErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryMonitorError 7 }
 
@@ -15050,7 +15050,7 @@ loadMonitorErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed load monitors is higher than the defined alarm level."
 	::= { loadMonitorError 1 }
 
@@ -15058,7 +15058,7 @@ loadMonitorErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the load monitor error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { loadMonitorError 2 }
@@ -15067,9 +15067,9 @@ loadMonitorErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { loadMonitorError 3 }
@@ -15081,7 +15081,7 @@ loadMonitorErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { loadMonitorError 4 }
 
@@ -15089,7 +15089,7 @@ loadMonitorErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed load monitors."
 	::= { loadMonitorError 5 }
 
@@ -15097,7 +15097,7 @@ loadMonitorErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { loadMonitorError 6 }
 
@@ -15105,7 +15105,7 @@ loadMonitorErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { loadMonitorError 7 }
 
@@ -15134,7 +15134,7 @@ ioUnitErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed IO units is higher than the defined alarm level."
 	::= { ioUnitError 1 }
 
@@ -15142,7 +15142,7 @@ ioUnitErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the IO unit error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { ioUnitError 2 }
@@ -15151,9 +15151,9 @@ ioUnitErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { ioUnitError 3 }
@@ -15165,7 +15165,7 @@ ioUnitErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { ioUnitError 4 }
 
@@ -15173,7 +15173,7 @@ ioUnitErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed IO units."
 	::= { ioUnitError 5 }
 
@@ -15181,7 +15181,7 @@ ioUnitErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { ioUnitError 6 }
 
@@ -15189,7 +15189,7 @@ ioUnitErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { ioUnitError 7 }
 
@@ -15218,7 +15218,7 @@ mainsMonitorErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed mains monitors is higher than the defined alarm level."
 	::= { mainsMonitorError 1 }
 
@@ -15226,7 +15226,7 @@ mainsMonitorErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the mains monitor error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { mainsMonitorError 2 }
@@ -15235,9 +15235,9 @@ mainsMonitorErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { mainsMonitorError 3 }
@@ -15249,7 +15249,7 @@ mainsMonitorErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { mainsMonitorError 4 }
 
@@ -15257,7 +15257,7 @@ mainsMonitorErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed mains monitors."
 	::= { mainsMonitorError 5 }
 
@@ -15265,7 +15265,7 @@ mainsMonitorErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { mainsMonitorError 6 }
 
@@ -15273,7 +15273,7 @@ mainsMonitorErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { mainsMonitorError 7 }
 
@@ -15302,7 +15302,7 @@ flexiMonitorErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed flexi monitors is higher than the defined alarm level."
 	::= { flexiMonitorError 1 }
 
@@ -15310,7 +15310,7 @@ flexiMonitorErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the flexi monitor error monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { flexiMonitorError 2 }
@@ -15319,9 +15319,9 @@ flexiMonitorErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { flexiMonitorError 3 }
@@ -15333,7 +15333,7 @@ flexiMonitorErrorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { flexiMonitorError 4 }
 
@@ -15341,7 +15341,7 @@ flexiMonitorErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed flexi monitors."
 	::= { flexiMonitorError 5 }
 
@@ -15349,7 +15349,7 @@ flexiMonitorErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { flexiMonitorError 6 }
 
@@ -15357,7 +15357,7 @@ flexiMonitorErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { flexiMonitorError 7 }
 
@@ -15386,7 +15386,7 @@ ambientTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the ambient temperature can be either one of the defined enumerated values"
 	::= { ambientTemperature 1 }
 
@@ -15394,7 +15394,7 @@ ambientTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the ambient temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { ambientTemperature 2 }
@@ -15403,9 +15403,9 @@ ambientTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { ambientTemperature 3 }
@@ -15417,7 +15417,7 @@ ambientTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { ambientTemperature 4 }
 
@@ -15425,7 +15425,7 @@ ambientTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the enabled ambient temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -15435,7 +15435,7 @@ ambientTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { ambientTemperature 6 }
 
@@ -15443,7 +15443,7 @@ ambientTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { ambientTemperature 7 }
 
@@ -15451,7 +15451,7 @@ ambientTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { ambientTemperature 8 }
 
@@ -15459,7 +15459,7 @@ ambientTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { ambientTemperature 9 }
 
@@ -15488,7 +15488,7 @@ deltaTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the delta temperature can be either one of the defined enumerated values"
 	::= { deltaTemperature 1 }
 
@@ -15496,7 +15496,7 @@ deltaTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the delta temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { deltaTemperature 2 }
@@ -15505,9 +15505,9 @@ deltaTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { deltaTemperature 3 }
@@ -15519,7 +15519,7 @@ deltaTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { deltaTemperature 4 }
 
@@ -15527,7 +15527,7 @@ deltaTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The delta temperature value.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -15537,7 +15537,7 @@ deltaTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { deltaTemperature 6 }
 
@@ -15545,7 +15545,7 @@ deltaTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { deltaTemperature 7 }
 
@@ -15553,7 +15553,7 @@ deltaTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { deltaTemperature 8 }
 
@@ -15561,7 +15561,7 @@ deltaTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { deltaTemperature 9 }
 
@@ -15590,7 +15590,7 @@ userSuspendedStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed attempts is higher than the defined alarm level."
 	::= { userSuspended 1 }
 
@@ -15598,7 +15598,7 @@ userSuspendedDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the login failure monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { userSuspended 2 }
@@ -15607,9 +15607,9 @@ userSuspendedTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { userSuspended 3 }
@@ -15621,7 +15621,7 @@ userSuspendedAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { userSuspended 4 }
 
@@ -15629,7 +15629,7 @@ userSuspendedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The detected number of failed attempts."
 	::= { userSuspended 5 }
 
@@ -15637,7 +15637,7 @@ userSuspendedMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { userSuspended 6 }
 
@@ -15648,7 +15648,7 @@ controlSystemSaveEnergyLog  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Save energy logs to FTP server."
 	::= { controlSystem 16 }
 
@@ -15659,7 +15659,7 @@ controlSystemSaveDataLog  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Save data logs to FTP server."
 	::= { controlSystem 17 }
 
@@ -15667,7 +15667,7 @@ controlSystemNTPServerIP  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(1..80))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { controlSystem 18 }
 
@@ -15678,7 +15678,7 @@ controlSystemReboot  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Reboot main controller (Smartpack 2, Smartpack S, Compack, Smartpack 2 TOUCH)"
 	::= { controlSystem 19 }
 
@@ -15689,7 +15689,7 @@ controlSystemSaveEventLog  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Save event logs to FTP server."
 	::= { controlSystem 20 }
 
@@ -15700,7 +15700,7 @@ controlSystemSaveAccountLog  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Save account logs to FTP server."
 	::= { controlSystem 21 }
 
@@ -15711,7 +15711,7 @@ controlSystemSetCfgFromXmlFiles  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Set configurations from default1.XML, default2.XML and default3.XML in Default folder"
 	::= { controlSystem 22 }
 
@@ -15719,7 +15719,7 @@ controlSystemNumberOfGenericModbusData  OBJECT-TYPE
 	SYNTAX     Integer32 (0..50)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of genaric Modbus data configured in system"
 	::= { controlSystem 23 }
 
@@ -15727,7 +15727,7 @@ controlSystemGenericModbusDataTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF ControlSystemGenericModbusDataEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { controlSystem 24 }
 
@@ -15735,7 +15735,7 @@ controlSystemGenericModbusDataEntry  OBJECT-TYPE
 	SYNTAX 	ControlSystemGenericModbusDataEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { controlSystemGenericModbusDataIndex }
 	::= { controlSystemGenericModbusDataTable 1 }
@@ -15755,7 +15755,7 @@ controlSystemGenericModbusDataIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..50)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows of table
 		The size of the table is defined by the system"
 	::= { controlSystemGenericModbusDataEntry 1 }
@@ -15764,7 +15764,7 @@ controlSystemGenericModbusDataDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"description of generic Modbus data"
 	::= { controlSystemGenericModbusDataEntry 2 }
 
@@ -15772,7 +15772,7 @@ controlSystemGenericModbusDataValue  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Value of generic Modbus data"
 	::= { controlSystemGenericModbusDataEntry 3 }
 
@@ -15780,7 +15780,7 @@ controlSystemGenericModbusDataUnit  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..12))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Unit of generic Modbus data"
 	::= { controlSystemGenericModbusDataEntry 4 }
 
@@ -15802,7 +15802,7 @@ demandResponseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Status of demand response"
 	::= { demandResponse 1 }
 
@@ -15810,9 +15810,9 @@ demandResponseMinBatteryBackupTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"This parameter set the required minimum battery backup time in minutes for this system. 
-		The controller must ensure that there always are at least the required battery backup time left 
+	DESCRIPTION
+		"This parameter set the required minimum battery backup time in minutes for this system.
+		The controller must ensure that there always are at least the required battery backup time left
 		during and after an DSR event. "
 	::= { demandResponse 2 }
 
@@ -15820,7 +15820,7 @@ demandResponsePowerForecast  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is an average load power in watt during last 52 hours "
 	::= { demandResponse 3 }
 
@@ -15828,7 +15828,7 @@ demandResponseAvailableEnergy  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Estimated available energy based on the battery capacity, the load power and the expected backup time of the load groups"
 	::= { demandResponse 4 }
 
@@ -15836,7 +15836,7 @@ demandResponseBatteryDischargePower  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This parameter controls the discharge power of the battery during an DSR event.
 		Scale is 0.01kw"
 	::= { demandResponse 5 }
@@ -15845,7 +15845,7 @@ demandResponseMaxTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The maximum discharge duration in minutes"
 	::= { demandResponse 6 }
 
@@ -15857,7 +15857,7 @@ demandResponseControl  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Activate/deactivate demand response"
 	::= { demandResponse 7 }
 
@@ -15865,7 +15865,7 @@ genericAlarmMonitorTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GenericAlarmMonitorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generic alarm monitors to be used with 3rd-party modbus devices"
 	::= { controlSystem 26 }
 
@@ -15873,7 +15873,7 @@ genericAlarmMonitorEntry  OBJECT-TYPE
 	SYNTAX 	GenericAlarmMonitorEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { genericAlarmMonitorIndex }
 	::= { genericAlarmMonitorTable 1 }
@@ -15899,7 +15899,7 @@ genericAlarmMonitorIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { genericAlarmMonitorEntry 1 }
 
@@ -15928,7 +15928,7 @@ genericAlarmMonitorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the alarm monitor can be either one of the defined enumerated values"
 	::= { genericAlarmMonitorEntry 2 }
 
@@ -15936,7 +15936,7 @@ genericAlarmMonitorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the generic alarm monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { genericAlarmMonitorEntry 3 }
@@ -15945,9 +15945,9 @@ genericAlarmMonitorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { genericAlarmMonitorEntry 4 }
@@ -15959,7 +15959,7 @@ genericAlarmMonitorAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { genericAlarmMonitorEntry 5 }
 
@@ -15967,7 +15967,7 @@ genericAlarmMonitorValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The generic alarm monitor value. Scale is dependent on the scale setting of the corresponding generic modbus value."
 	::= { genericAlarmMonitorEntry 6 }
 
@@ -15975,7 +15975,7 @@ genericAlarmMonitorUnit  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the unit of generic alarm monitor. "
 	::= { genericAlarmMonitorEntry 7 }
 
@@ -15983,7 +15983,7 @@ genericLogsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GenericLogsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Generic logs connected to the last ten generic alarm monitors (#91-#100)"
 	::= { controlSystem 27 }
 
@@ -15991,7 +15991,7 @@ genericLogsEntry  OBJECT-TYPE
 	SYNTAX 	GenericLogsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { genericLogsIndex }
 	::= { genericLogsTable 1 }
@@ -16013,7 +16013,7 @@ genericLogsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generic log index 1...10"
 	::= { genericLogsEntry 1 }
 
@@ -16021,7 +16021,7 @@ genericLogsAccumulated  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated trip log value in hours."
 	::= { genericLogsEntry 2 }
 
@@ -16029,7 +16029,7 @@ genericLogsDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily log"
 	::= { genericLogsEntry 3 }
 
@@ -16037,7 +16037,7 @@ genericLogsWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weekly log"
 	::= { genericLogsEntry 4 }
 
@@ -16045,7 +16045,7 @@ genericLogsMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly log"
 	::= { genericLogsEntry 5 }
 
@@ -16053,7 +16053,7 @@ genericLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GenericLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily generic log."
 	::= { controlSystem 28 }
 
@@ -16061,9 +16061,9 @@ genericLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	GenericLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { genericLogsIndex, 
+	INDEX { genericLogsIndex,
 		genericLogDaysIndex }
 	::= { genericLogDaysTable 1 }
 
@@ -16078,7 +16078,7 @@ genericLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Unsigned32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of genericLogDaysTable"
 	::= { genericLogDaysEntry 1 }
 
@@ -16086,7 +16086,7 @@ genericLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generic monitor value in minutes logged every day."
 	::= { genericLogDaysEntry 2 }
 
@@ -16094,7 +16094,7 @@ genericLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GenericLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly generic log."
 	::= { controlSystem 29 }
 
@@ -16102,9 +16102,9 @@ genericLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	GenericLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { genericLogsIndex, 
+	INDEX { genericLogsIndex,
 		genericLogWeeksIndex }
 	::= { genericLogWeeksTable 1 }
 
@@ -16119,7 +16119,7 @@ genericLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Unsigned32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of genericLogWeeksTable"
 	::= { genericLogWeeksEntry 1 }
 
@@ -16127,7 +16127,7 @@ genericLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generic monitor value in hours logged every week."
 	::= { genericLogWeeksEntry 2 }
 
@@ -16135,7 +16135,7 @@ genericLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF GenericLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly generic log."
 	::= { controlSystem 30 }
 
@@ -16143,9 +16143,9 @@ genericLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	GenericLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
-	INDEX { genericLogsIndex, 
+	INDEX { genericLogsIndex,
 		genericLogMonthsIndex }
 	::= { genericLogMonthsTable 1 }
 
@@ -16160,7 +16160,7 @@ genericLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Unsigned32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of genericLogMonthsTable"
 	::= { genericLogMonthsEntry 1 }
 
@@ -16168,7 +16168,7 @@ genericLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"generic monitor value in hours logged every month."
 	::= { genericLogMonthsEntry 2 }
 
@@ -16179,7 +16179,7 @@ tariffControlEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable tariff control function"
 	::= { tariffControl 1 }
 
@@ -16190,7 +16190,7 @@ tariffControlChargeInhibit  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable battery charge inhibit"
 	::= { tariffControl 2 }
 
@@ -16198,7 +16198,7 @@ tariffControlMaxTime  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The maximum discharge duration in minutes"
 	::= { tariffControl 3 }
 
@@ -16209,7 +16209,7 @@ tariffControlBatteryVoltageStopControl  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable battery voltage stop control"
 	::= { tariffControl 4 }
 
@@ -16217,7 +16217,7 @@ tariffControlBatteryVoltageStopLimit  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { tariffControl 5 }
 
@@ -16225,7 +16225,7 @@ tariffControlBatteryVoltageHysteresis  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { tariffControl 6 }
 
@@ -16237,7 +16237,7 @@ tariffControlActivate  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Activate/deactivate demand response"
 	::= { tariffControl 7 }
 
@@ -16245,7 +16245,7 @@ numberOfGenericAlarmMonitor  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of used generic alarm monitors"
 	::= { controlSystem 32 }
 
@@ -16253,7 +16253,7 @@ alarmGroupTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF AlarmGroupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { alarmGroups 1 }
 
@@ -16261,7 +16261,7 @@ alarmGroupEntry  OBJECT-TYPE
 	SYNTAX 	AlarmGroupEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { alarmGroupIndex }
 	::= { alarmGroupTable 1 }
@@ -16279,7 +16279,7 @@ alarmGroupIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..49)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..49 of alarmGroupTable"
 	::= { alarmGroupEntry 1 }
 
@@ -16290,7 +16290,7 @@ alarmGroupStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of alarm group"
 	::= { alarmGroupEntry 2 }
 
@@ -16298,12 +16298,12 @@ alarmGroupDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the alarm group. This is stored in the system controller
 		and can be changed by the user."
 	::= { alarmGroupEntry 3 }
 
--- The reported status of the battery group 2 subsystem. The status reflects the condition 
+-- The reported status of the battery group 2 subsystem. The status reflects the condition
 -- of all underlying alarm monitors in the battery group 2 subsystem
 
 batteryGroup2Status  OBJECT-TYPE
@@ -16331,9 +16331,9 @@ batteryGroup2Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"A toplevel status for the battery group 2.The state of this reflects the status of all 
-		underlying statuses for the battery. Any change in one of the 'data monitors' in 
+	DESCRIPTION
+		"A toplevel status for the battery group 2.The state of this reflects the status of all
+		underlying statuses for the battery. Any change in one of the 'data monitors' in
 		the battery subsystem will propagate up to this status indicator."
 	::= { batteryGroup2 1 }
 
@@ -16341,7 +16341,7 @@ batteryGroup2Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..32))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A descriptive name of the battery installed in the battery group 2."
 	::= { batteryGroup2 2 }
 
@@ -16349,7 +16349,7 @@ batteryGroup2ReferenceVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (840..60417)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The reference voltage of battery group 2."
 	::= { batteryGroup2 3 }
 
@@ -16378,12 +16378,12 @@ batteryGroup2FusesStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
-		"The state of the battery fuses/breakers can mainly be normal(1) or majorAlarm(3) and  
+	DESCRIPTION
+		"The state of the battery fuses/breakers can mainly be normal(1) or majorAlarm(3) and
 		some other rarely used values ."
 	::= { batteryGroup2 4 }
 
--- The status value for the measured battery voltage. If the battery voltage reach outside 
+-- The status value for the measured battery voltage. If the battery voltage reach outside
 -- the limits set by the major/minor low/high level settings this status will change accordingly.
 
 batteryGroup2VoltageStatus  OBJECT-TYPE
@@ -16411,7 +16411,7 @@ batteryGroup2VoltageStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured battery voltage."
 	::= { batteryGroup2Voltage 1 }
 
@@ -16419,7 +16419,7 @@ batteryGroup2VoltageDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery voltage monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryGroup2Voltage 2 }
@@ -16428,9 +16428,9 @@ batteryGroup2VoltageTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2Voltage 3 }
@@ -16442,7 +16442,7 @@ batteryGroup2VoltageAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery voltage alarm enable/disable control"
 	::= { batteryGroup2Voltage 4 }
 
@@ -16450,7 +16450,7 @@ batteryGroup2VoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured battery voltage.Scale is 0.01v."
 	::= { batteryGroup2Voltage 5 }
 
@@ -16458,7 +16458,7 @@ batteryGroup2VoltageMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Major High Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryGroup2Voltage 6 }
 
@@ -16466,7 +16466,7 @@ batteryGroup2VoltageMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Minor High Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryGroup2Voltage 7 }
 
@@ -16474,7 +16474,7 @@ batteryGroup2VoltageMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Minor Low Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryGroup2Voltage 8 }
 
@@ -16482,7 +16482,7 @@ batteryGroup2VoltageMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Major Low Battery Voltage alarm limit set voltage.Scale is 0.01v."
 	::= { batteryGroup2Voltage 9 }
 
@@ -16511,7 +16511,7 @@ batteryGroup2CurrentsStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured battery current"
 	::= { batteryGroup2Currents 1 }
 
@@ -16519,7 +16519,7 @@ batteryGroup2CurrentsDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery current monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryGroup2Currents 2 }
@@ -16528,9 +16528,9 @@ batteryGroup2CurrentsTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2Currents 3 }
@@ -16542,7 +16542,7 @@ batteryGroup2CurrentsAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2Currents 4 }
 
@@ -16550,7 +16550,7 @@ batteryGroup2CurrentsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured total battery current.
 		This is the sum of all the enabled shunt measurements in the system.
 		Negative battery current indicates discharging of the batteries.
@@ -16562,7 +16562,7 @@ batteryGroup2CurrentsMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2Currents 6 }
 
@@ -16570,7 +16570,7 @@ batteryGroup2CurrentsMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2Currents 7 }
 
@@ -16578,7 +16578,7 @@ batteryGroup2CurrentsMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2Currents 8 }
 
@@ -16586,7 +16586,7 @@ batteryGroup2CurrentsMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2Currents 9 }
 
@@ -16615,7 +16615,7 @@ batteryGroup2TemperaturesStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the battery fuses/breakers can be either one of the defined enumerated values"
 	::= { batteryGroup2Temperatures 1 }
 
@@ -16623,7 +16623,7 @@ batteryGroup2TemperaturesDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryGroup2Temperatures 2 }
@@ -16632,9 +16632,9 @@ batteryGroup2TemperaturesTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2Temperatures 3 }
@@ -16646,7 +16646,7 @@ batteryGroup2TemperaturesAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2Temperatures 4 }
 
@@ -16654,7 +16654,7 @@ batteryGroup2TemperaturesValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the enabled battery temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -16664,7 +16664,7 @@ batteryGroup2TemperaturesMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2Temperatures 6 }
 
@@ -16672,7 +16672,7 @@ batteryGroup2TemperaturesMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2Temperatures 7 }
 
@@ -16680,7 +16680,7 @@ batteryGroup2TemperaturesMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2Temperatures 8 }
 
@@ -16688,7 +16688,7 @@ batteryGroup2TemperaturesMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2Temperatures 9 }
 
@@ -16717,7 +16717,7 @@ batteryGroup2TimeLeftStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the estimated battery remaining backup time."
 	::= { batteryGroup2TimeLeft 1 }
 
@@ -16725,7 +16725,7 @@ batteryGroup2TimeLeftDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery discharge time monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryGroup2TimeLeft 2 }
@@ -16734,9 +16734,9 @@ batteryGroup2TimeLeftTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2TimeLeft 3 }
@@ -16748,7 +16748,7 @@ batteryGroup2TimeLeftAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2TimeLeft 4 }
 
@@ -16756,7 +16756,7 @@ batteryGroup2TimeLeftValue  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The estimated value of battery remaining backup time."
 	::= { batteryGroup2TimeLeft 5 }
 
@@ -16764,7 +16764,7 @@ batteryGroup2TimeLeftMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryGroup2TimeLeft 6 }
 
@@ -16772,7 +16772,7 @@ batteryGroup2TimeLeftMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryGroup2TimeLeft 7 }
 
@@ -16801,7 +16801,7 @@ batteryGroup2RemainingCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery remaining capacity monitor."
 	::= { batteryGroup2RemainingCapacity 1 }
 
@@ -16809,7 +16809,7 @@ batteryGroup2RemainingCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery remaining capacity monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { batteryGroup2RemainingCapacity 2 }
@@ -16818,9 +16818,9 @@ batteryGroup2RemainingCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2RemainingCapacity 3 }
@@ -16832,7 +16832,7 @@ batteryGroup2RemainingCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2RemainingCapacity 4 }
 
@@ -16840,7 +16840,7 @@ batteryGroup2RemainingCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery remaining capacity (SOC) value estimated from the latest battery test result."
 	::= { batteryGroup2RemainingCapacity 5 }
 
@@ -16848,7 +16848,7 @@ batteryGroup2RemainingCapacityMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2RemainingCapacity 6 }
 
@@ -16856,7 +16856,7 @@ batteryGroup2RemainingCapacityMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2RemainingCapacity 7 }
 
@@ -16885,7 +16885,7 @@ batteryGroup2UsedCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery used capacity (DoD) monitor"
 	::= { batteryGroup2UsedCapacity 1 }
 
@@ -16893,7 +16893,7 @@ batteryGroup2UsedCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery used capacity (DoD) monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryGroup2UsedCapacity 2 }
@@ -16902,9 +16902,9 @@ batteryGroup2UsedCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2UsedCapacity 3 }
@@ -16916,7 +16916,7 @@ batteryGroup2UsedCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2UsedCapacity 4 }
 
@@ -16924,7 +16924,7 @@ batteryGroup2UsedCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the estimated battery used capacity (DoD)."
 	::= { batteryGroup2UsedCapacity 5 }
 
@@ -16932,7 +16932,7 @@ batteryGroup2UsedCapacityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryGroup2UsedCapacity 6 }
 
@@ -16940,7 +16940,7 @@ batteryGroup2UsedCapacityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryGroup2UsedCapacity 7 }
 
@@ -16969,7 +16969,7 @@ batteryGroup2TotalCapacityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the total capacity monitor."
 	::= { batteryGroup2TotalCapacity 1 }
 
@@ -16977,7 +16977,7 @@ batteryGroup2TotalCapacityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery total capacity monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryGroup2TotalCapacity 2 }
@@ -16986,9 +16986,9 @@ batteryGroup2TotalCapacityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2TotalCapacity 3 }
@@ -17000,7 +17000,7 @@ batteryGroup2TotalCapacityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2TotalCapacity 4 }
 
@@ -17008,7 +17008,7 @@ batteryGroup2TotalCapacityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the estimated total battery capacity (installed Ah - SoH) value."
 	::= { batteryGroup2TotalCapacity 5 }
 
@@ -17016,7 +17016,7 @@ batteryGroup2TotalCapacityMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2TotalCapacity 6 }
 
@@ -17024,7 +17024,7 @@ batteryGroup2TotalCapacityMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2TotalCapacity 7 }
 
@@ -17053,7 +17053,7 @@ batteryGroup2QualityStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery quality (SoH) monitor."
 	::= { batteryGroup2Quality 1 }
 
@@ -17061,7 +17061,7 @@ batteryGroup2QualityDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery quality (SoH) monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryGroup2Quality 2 }
@@ -17070,9 +17070,9 @@ batteryGroup2QualityTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2Quality 3 }
@@ -17084,7 +17084,7 @@ batteryGroup2QualityAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2Quality 4 }
 
@@ -17092,7 +17092,7 @@ batteryGroup2QualityValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery quality (SoH) based on the latest battery test"
 	::= { batteryGroup2Quality 5 }
 
@@ -17100,7 +17100,7 @@ batteryGroup2QualityMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryGroup2Quality 6 }
 
@@ -17108,7 +17108,7 @@ batteryGroup2QualityMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryGroup2Quality 7 }
 
@@ -17137,7 +17137,7 @@ batteryGroup2LVBDStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor is connected, disconnected, disabled or in any other alarm condition"
 	::= { batteryGroup2LVBD 1 }
 
@@ -17145,7 +17145,7 @@ batteryGroup2LVBDDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery LVBD monitor. This is stored in the system controller
 		and can be changed by the user.  "
 	::= { batteryGroup2LVBD 2 }
@@ -17154,9 +17154,9 @@ batteryGroup2LVBDTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2LVBD 3 }
@@ -17168,7 +17168,7 @@ batteryGroup2LVBDEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the LVBD will be reported."
 	::= { batteryGroup2LVBD 4 }
 
@@ -17176,7 +17176,7 @@ batteryGroup2LVBDValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of the LVBD."
 	::= { batteryGroup2LVBD 5 }
 
@@ -17184,7 +17184,7 @@ batteryGroup2LVBDConnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor's Reconnect Voltage"
 	::= { batteryGroup2LVBD 6 }
 
@@ -17192,7 +17192,7 @@ batteryGroup2LVBDDisconnectVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Battery Contactor's Disconnect Voltage"
 	::= { batteryGroup2LVBD 7 }
 
@@ -17203,7 +17203,7 @@ batteryGroup2ChargeCurrentLimitEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable/disable of the battery charge current limitation feature; 0=disable, 1=enable."
 	::= { batteryGroup2ChargeCurrentLimit 1 }
 
@@ -17211,7 +17211,7 @@ batteryGroup2ChargeCurrentLimitValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..32767)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Battery charging current limit value. Used only when AC source is mains feed.
 		Note that the units measured may be i Amperes or in Deciamperes depending on global system settings"
 	::= { batteryGroup2ChargeCurrentLimit 2 }
@@ -17220,7 +17220,7 @@ batteryGroup2BoostVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (870..60418)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Voltage at which the DC System boost charges the batteries."
 	::= { batteryGroup2Boost 1 }
 
@@ -17232,7 +17232,7 @@ batteryGroup2BoostCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery boost if the system allows it."
 	::= { batteryGroup2Boost 2 }
 
@@ -17240,7 +17240,7 @@ batteryGroup2BoostCurrentThreshold  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The boosting will terminate when the charge current drops below the BoostCurrentThreshold limit."
 	::= { batteryGroup2Boost 3 }
 
@@ -17248,8 +17248,8 @@ batteryGroup2BoostManualMaxDuration  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"A protection against overcharging.  
+	DESCRIPTION
+		"A protection against overcharging.
 		When running manual boost, the boosting will always terminate at this point.  "
 	::= { batteryGroup2Boost 4 }
 
@@ -17257,7 +17257,7 @@ batteryGroup2TestVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the battery test end voltage. The battery test will be terminated when the voltage
 		drops below the end voltage."
 	::= { batteryGroup2Test 1 }
@@ -17270,7 +17270,7 @@ batteryGroup2TestCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery test if the system allows it."
 	::= { batteryGroup2Test 2 }
 
@@ -17278,7 +17278,7 @@ batteryGroup2TestNumberOfResults  OBJECT-TYPE
 	SYNTAX     Integer32 (0..10)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the number of valid battery test results stored in controller."
 	::= { batteryGroup2Test 3 }
 
@@ -17286,7 +17286,7 @@ batteryGroup2TestResultTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2TestResultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains the battery test results stored in controller."
 	::= { batteryGroup2Test 4 }
 
@@ -17294,7 +17294,7 @@ batteryGroup2TestResultEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2TestResultEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2TestResultIndex }
 	::= { batteryGroup2TestResultTable 1 }
@@ -17324,7 +17324,7 @@ batteryGroup2TestResultIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..10)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A index pointing to one of ten possible battery test results"
 	::= { batteryGroup2TestResultEntry 1 }
 
@@ -17332,7 +17332,7 @@ batteryGroup2TestResultStartDateTime  OBJECT-TYPE
 	SYNTAX     DateAndTime
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the time and date when the test started."
 	::= { batteryGroup2TestResultEntry 2 }
 
@@ -17340,7 +17340,7 @@ batteryGroup2TestResultDuration  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test duration in minutes."
 	::= { batteryGroup2TestResultEntry 3 }
 
@@ -17348,7 +17348,7 @@ batteryGroup2TestResultDischarged  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the discharged Ah during test."
 	::= { batteryGroup2TestResultEntry 4 }
 
@@ -17356,7 +17356,7 @@ batteryGroup2TestResultQuality  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the calculated battery quality (SoH)in percentage."
 	::= { batteryGroup2TestResultEntry 5 }
 
@@ -17364,7 +17364,7 @@ batteryGroup2TestResultEndVoltage  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test end voltage in volt."
 	::= { batteryGroup2TestResultEntry 6 }
 
@@ -17383,7 +17383,7 @@ batteryGroup2TestResultTestResult  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test result."
 	::= { batteryGroup2TestResultEntry 7 }
 
@@ -17398,7 +17398,7 @@ batteryGroup2TestResultTerminationCriteria  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the test Termination Criteria."
 	::= { batteryGroup2TestResultEntry 8 }
 
@@ -17406,7 +17406,7 @@ batteryGroup2TestResultBatteryTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the battery temperature"
 	::= { batteryGroup2TestResultEntry 9 }
 
@@ -17414,7 +17414,7 @@ batteryGroup2TestDuration  OBJECT-TYPE
 	SYNTAX     Unsigned32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the battery test max duration. "
 	::= { batteryGroup2Test 5 }
 
@@ -17425,7 +17425,7 @@ batteryGroup2TestCfgTestType  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is to configurate normal or simplified battery test."
 	::= { batteryGroup2Test 6 }
 
@@ -17436,7 +17436,7 @@ batteryGroup2TestEnableMaxDuration  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is to enable/disable battery test max duration."
 	::= { batteryGroup2Test 7 }
 
@@ -17447,7 +17447,7 @@ batteryGroup2TempCompEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Enable (1) or Disable (0)  of Battery Temperature Compensated output regulation mode"
 	::= { batteryGroup2TempComp 1 }
 
@@ -17476,7 +17476,7 @@ batteryGroup2BankStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of battery bank"
 	::= { batteryGroup2Bank 1 }
 
@@ -17484,7 +17484,7 @@ batteryGroup2BankNumberOfTemperatures  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of temperature measurements in battery bank."
 	::= { batteryGroup2Bank 2 }
 
@@ -17492,7 +17492,7 @@ batteryGroup2BankNumberOfCurrents  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of current measurements in battery bank."
 	::= { batteryGroup2Bank 3 }
 
@@ -17500,7 +17500,7 @@ batteryGroup2BankNumberOfFuses  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fuses installed in battery bank."
 	::= { batteryGroup2Bank 4 }
 
@@ -17508,7 +17508,7 @@ batteryGroup2BankNumberOfSymmetries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of fuses installed in battery bank."
 	::= { batteryGroup2Bank 5 }
 
@@ -17516,7 +17516,7 @@ batteryGroup2BankTemperatureTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2BankTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryGroup2Bank 6 }
 
@@ -17524,7 +17524,7 @@ batteryGroup2BankTemperatureEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2BankTemperatureEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2TemperatureIndex }
 	::= { batteryGroup2BankTemperatureTable 1 }
@@ -17556,7 +17556,7 @@ batteryGroup2TemperatureIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the temperature input table.
 		The size of the table is defined by the batteryGroup2BankNumberOfTemperatures   "
 	::= { batteryGroup2BankTemperatureEntry 1 }
@@ -17586,7 +17586,7 @@ batteryGroup2TemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery temperature monitor"
 	::= { batteryGroup2BankTemperatureEntry 2 }
 
@@ -17594,7 +17594,7 @@ batteryGroup2TemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryGroup2BankTemperatureEntry 3 }
@@ -17603,9 +17603,9 @@ batteryGroup2TemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2BankTemperatureEntry 4 }
@@ -17617,7 +17617,7 @@ batteryGroup2TemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2BankTemperatureEntry 5 }
 
@@ -17625,7 +17625,7 @@ batteryGroup2TemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery temperature."
 	::= { batteryGroup2BankTemperatureEntry 6 }
 
@@ -17633,7 +17633,7 @@ batteryGroup2TemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2BankTemperatureEntry 7 }
 
@@ -17641,7 +17641,7 @@ batteryGroup2TemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2BankTemperatureEntry 8 }
 
@@ -17649,7 +17649,7 @@ batteryGroup2TemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2BankTemperatureEntry 9 }
 
@@ -17657,7 +17657,7 @@ batteryGroup2TemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2BankTemperatureEntry 10 }
 
@@ -17665,7 +17665,7 @@ batteryGroup2BankCurrentTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2BankCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryGroup2Bank 7 }
 
@@ -17673,7 +17673,7 @@ batteryGroup2BankCurrentEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2BankCurrentEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2CurrentIndex }
 	::= { batteryGroup2BankCurrentTable 1 }
@@ -17705,7 +17705,7 @@ batteryGroup2CurrentIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the current input table.
 		        The size of the table is defined by the system"
 	::= { batteryGroup2BankCurrentEntry 1 }
@@ -17735,7 +17735,7 @@ batteryGroup2CurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery current monitor"
 	::= { batteryGroup2BankCurrentEntry 2 }
 
@@ -17743,7 +17743,7 @@ batteryGroup2CurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery current monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryGroup2BankCurrentEntry 3 }
@@ -17752,9 +17752,9 @@ batteryGroup2CurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2BankCurrentEntry 4 }
@@ -17766,7 +17766,7 @@ batteryGroup2CurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2BankCurrentEntry 5 }
 
@@ -17774,7 +17774,7 @@ batteryGroup2CurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery current"
 	::= { batteryGroup2BankCurrentEntry 6 }
 
@@ -17782,7 +17782,7 @@ batteryGroup2CurrentMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2BankCurrentEntry 7 }
 
@@ -17790,7 +17790,7 @@ batteryGroup2CurrentMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2BankCurrentEntry 8 }
 
@@ -17798,7 +17798,7 @@ batteryGroup2CurrentMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { batteryGroup2BankCurrentEntry 9 }
 
@@ -17806,7 +17806,7 @@ batteryGroup2CurrentMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { batteryGroup2BankCurrentEntry 10 }
 
@@ -17814,7 +17814,7 @@ batteryGroup2BankFuseTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2BankFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryGroup2Bank 8 }
 
@@ -17822,7 +17822,7 @@ batteryGroup2BankFuseEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2BankFuseEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2FuseIndex }
 	::= { batteryGroup2BankFuseTable 1 }
@@ -17846,7 +17846,7 @@ batteryGroup2FuseIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..4)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the fuse table.
 		        The size of the table is defined by the system"
 	::= { batteryGroup2BankFuseEntry 1 }
@@ -17876,7 +17876,7 @@ batteryGroup2FuseStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery fuse monitor"
 	::= { batteryGroup2BankFuseEntry 2 }
 
@@ -17884,7 +17884,7 @@ batteryGroup2FuseDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery fuse monitor. This is stored in the system controller
 		and can be changed by the user."
 	::= { batteryGroup2BankFuseEntry 3 }
@@ -17893,9 +17893,9 @@ batteryGroup2FuseTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off."
 	::= { batteryGroup2BankFuseEntry 4 }
@@ -17907,7 +17907,7 @@ batteryGroup2FuseAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2BankFuseEntry 5 }
 
@@ -17915,7 +17915,7 @@ batteryGroup2FuseValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured value of battery fuse input."
 	::= { batteryGroup2BankFuseEntry 6 }
 
@@ -17923,7 +17923,7 @@ batteryGroup2BankSymmetryTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2BankSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { batteryGroup2Bank 9 }
 
@@ -17931,7 +17931,7 @@ batteryGroup2BankSymmetryEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2BankSymmetryEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2BankSymmetryIndex }
 	::= { batteryGroup2BankSymmetryTable 1 }
@@ -17961,7 +17961,7 @@ batteryGroup2BankSymmetryIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..8)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This index denotes which row in the symmetry input table.
 		The size of the table is defined by the batteryMonitorNumberOfSymmetries"
 	::= { batteryGroup2BankSymmetryEntry 1 }
@@ -17991,7 +17991,7 @@ batteryGroup2BankSymmetryStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of battery symmetry monitor"
 	::= { batteryGroup2BankSymmetryEntry 2 }
 
@@ -17999,7 +17999,7 @@ batteryGroup2BankSymmetryDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery monitor symmetry. This is stored in the system controller
 		and can be changed by the user. "
 	::= { batteryGroup2BankSymmetryEntry 3 }
@@ -18008,9 +18008,9 @@ batteryGroup2BankSymmetryTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alam condition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alam condition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2BankSymmetryEntry 4 }
@@ -18022,7 +18022,7 @@ batteryGroup2BankSymmetryAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2BankSymmetryEntry 5 }
 
@@ -18030,7 +18030,7 @@ batteryGroup2BankSymmetryMeasureValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry voltage in battery monitor."
 	::= { batteryGroup2BankSymmetryEntry 6 }
 
@@ -18038,7 +18038,7 @@ batteryGroup2BankSymmetryDeltaValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The measured battery symmetry delta voltage in battery monitor."
 	::= { batteryGroup2BankSymmetryEntry 7 }
 
@@ -18046,7 +18046,7 @@ batteryGroup2BankSymmetryMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { batteryGroup2BankSymmetryEntry 8 }
 
@@ -18054,7 +18054,7 @@ batteryGroup2BankSymmetryMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { batteryGroup2BankSymmetryEntry 9 }
 
@@ -18062,7 +18062,7 @@ batteryGroup2EnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered to/from battery."
 	::= { batteryGroup2EnergyLog 1 }
 
@@ -18070,7 +18070,7 @@ batteryGroup2EnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery hourly energy log."
 	::= { batteryGroup2EnergyLog 2 }
 
@@ -18078,7 +18078,7 @@ batteryGroup2EnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2EnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of battery."
 	::= { batteryGroup2EnergyLog 3 }
 
@@ -18086,7 +18086,7 @@ batteryGroup2EnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2EnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2EnergyLogLastHoursIndex }
 	::= { batteryGroup2EnergyLogLastHoursTable 1 }
@@ -18102,7 +18102,7 @@ batteryGroup2EnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastHoursTable"
 	::= { batteryGroup2EnergyLogLastHoursEntry 1 }
 
@@ -18110,7 +18110,7 @@ batteryGroup2EnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { batteryGroup2EnergyLogLastHoursEntry 2 }
 
@@ -18118,7 +18118,7 @@ batteryGroup2EnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery daily energy log."
 	::= { batteryGroup2EnergyLog 4 }
 
@@ -18126,7 +18126,7 @@ batteryGroup2EnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2EnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of battery."
 	::= { batteryGroup2EnergyLog 5 }
 
@@ -18134,7 +18134,7 @@ batteryGroup2EnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2EnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2EnergyLogLastDaysIndex }
 	::= { batteryGroup2EnergyLogLastDaysTable 1 }
@@ -18150,7 +18150,7 @@ batteryGroup2EnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastDaysTable"
 	::= { batteryGroup2EnergyLogLastDaysEntry 1 }
 
@@ -18158,7 +18158,7 @@ batteryGroup2EnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { batteryGroup2EnergyLogLastDaysEntry 2 }
 
@@ -18166,7 +18166,7 @@ batteryGroup2EnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in battery weekly energy log."
 	::= { batteryGroup2EnergyLog 6 }
 
@@ -18174,7 +18174,7 @@ batteryGroup2EnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2EnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of battery."
 	::= { batteryGroup2EnergyLog 7 }
 
@@ -18182,7 +18182,7 @@ batteryGroup2EnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2EnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2EnergyLogLastWeeksIndex }
 	::= { batteryGroup2EnergyLogLastWeeksTable 1 }
@@ -18198,7 +18198,7 @@ batteryGroup2EnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryEnergyLogLastWeekTable"
 	::= { batteryGroup2EnergyLogLastWeeksEntry 1 }
 
@@ -18206,7 +18206,7 @@ batteryGroup2EnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { batteryGroup2EnergyLogLastWeeksEntry 2 }
 
@@ -18214,7 +18214,7 @@ batteryGroup2CycleLogTotalCycles  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the total number of battery discharge cycles."
 	::= { batteryGroup2CycleLog 1 }
 
@@ -18222,7 +18222,7 @@ batteryGroup2CycleLogDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in daily battery discharge cycle log."
 	::= { batteryGroup2CycleLog 2 }
 
@@ -18230,7 +18230,7 @@ batteryGroup2CycleLogDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2CycleLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily battery discharge cycle log."
 	::= { batteryGroup2CycleLog 3 }
 
@@ -18238,7 +18238,7 @@ batteryGroup2CycleLogDaysEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2CycleLogDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2CycleLogDaysIndex }
 	::= { batteryGroup2CycleLogDaysTable 1 }
@@ -18254,7 +18254,7 @@ batteryGroup2CycleLogDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastDaysTable"
 	::= { batteryGroup2CycleLogDaysEntry 1 }
 
@@ -18262,7 +18262,7 @@ batteryGroup2CycleLogDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every day."
 	::= { batteryGroup2CycleLogDaysEntry 2 }
 
@@ -18270,7 +18270,7 @@ batteryGroup2CycleLogWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in weeky battery discharge cycle log."
 	::= { batteryGroup2CycleLog 4 }
 
@@ -18278,7 +18278,7 @@ batteryGroup2CycleLogWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2CycleLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly battery discharge cycle log."
 	::= { batteryGroup2CycleLog 5 }
 
@@ -18286,7 +18286,7 @@ batteryGroup2CycleLogWeeksEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2CycleLogWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2CycleLogWeeksIndex }
 	::= { batteryGroup2CycleLogWeeksTable 1 }
@@ -18302,7 +18302,7 @@ batteryGroup2CycleLogWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastWeeksTable"
 	::= { batteryGroup2CycleLogWeeksEntry 1 }
 
@@ -18310,7 +18310,7 @@ batteryGroup2CycleLogWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every week."
 	::= { batteryGroup2CycleLogWeeksEntry 2 }
 
@@ -18318,7 +18318,7 @@ batteryGroup2CycleLogMonthsNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32 (0..52)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in monthly battery discharge cycle log."
 	::= { batteryGroup2CycleLog 6 }
 
@@ -18326,7 +18326,7 @@ batteryGroup2CycleLogMonthsTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF BatteryGroup2CycleLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains monthly battery discharge cycle log."
 	::= { batteryGroup2CycleLog 7 }
 
@@ -18334,7 +18334,7 @@ batteryGroup2CycleLogMonthsEntry  OBJECT-TYPE
 	SYNTAX 	BatteryGroup2CycleLogMonthsEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { batteryGroup2CycleLogMonthsIndex }
 	::= { batteryGroup2CycleLogMonthsTable 1 }
@@ -18350,7 +18350,7 @@ batteryGroup2CycleLogMonthsIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52  of batteryCycleLogLastMonthTable"
 	::= { batteryGroup2CycleLogMonthsEntry 1 }
 
@@ -18358,7 +18358,7 @@ batteryGroup2CycleLogMonthsValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of discharge cycles logged every month."
 	::= { batteryGroup2CycleLogMonthsEntry 2 }
 
@@ -18366,7 +18366,7 @@ batteryGroup2EqualizeVoltage  OBJECT-TYPE
 	SYNTAX     Integer32 (870..60418)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The Voltage at which the DC System equalize charges the batteries."
 	::= { batteryGroup2Equalize 1 }
 
@@ -18378,7 +18378,7 @@ batteryGroup2EqualizeCommand  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This pushbutton will start or stop a manual battery equalize if the system allows it."
 	::= { batteryGroup2Equalize 2 }
 
@@ -18386,7 +18386,7 @@ batteryGroup2EqualizeCurrentThreshold  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The equalizing will terminate when the charge current drops below the EqualizeCurrentThreshold limit."
 	::= { batteryGroup2Equalize 3 }
 
@@ -18394,8 +18394,8 @@ batteryGroup2EqualizeManualMaxDuration  OBJECT-TYPE
 	SYNTAX     Integer32 (0..1440)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
-		"A protection against overcharging.  
+	DESCRIPTION
+		"A protection against overcharging.
 		When running manual equalize, the boosting will always terminate at this point.  "
 	::= { batteryGroup2Equalize 4 }
 
@@ -18424,7 +18424,7 @@ batteryGroup2AhChargedStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery ah charged monitor."
 	::= { batteryGroup2AhCharged 1 }
 
@@ -18432,7 +18432,7 @@ batteryGroup2AhChargedDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery ah charged monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryGroup2AhCharged 2 }
@@ -18441,9 +18441,9 @@ batteryGroup2AhChargedTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2AhCharged 3 }
@@ -18455,7 +18455,7 @@ batteryGroup2AhChargedAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2AhCharged 4 }
 
@@ -18463,7 +18463,7 @@ batteryGroup2AhChargedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery ah (x100) charged value."
 	::= { batteryGroup2AhCharged 5 }
 
@@ -18471,7 +18471,7 @@ batteryGroup2AhChargedMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2AhCharged 6 }
 
@@ -18479,7 +18479,7 @@ batteryGroup2AhChargedMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2AhCharged 7 }
 
@@ -18508,7 +18508,7 @@ batteryGroup2AhDischargedStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the battery ah discharged monitor."
 	::= { batteryGroup2AhDischarged 1 }
 
@@ -18516,7 +18516,7 @@ batteryGroup2AhDischargedDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the battery ah discharged monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { batteryGroup2AhDischarged 2 }
@@ -18525,9 +18525,9 @@ batteryGroup2AhDischargedTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { batteryGroup2AhDischarged 3 }
@@ -18539,7 +18539,7 @@ batteryGroup2AhDischargedAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { batteryGroup2AhDischarged 4 }
 
@@ -18547,7 +18547,7 @@ batteryGroup2AhDischargedValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The calculated battery ah (x100) discharged value."
 	::= { batteryGroup2AhDischarged 5 }
 
@@ -18555,7 +18555,7 @@ batteryGroup2AhDischargedMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { batteryGroup2AhDischarged 6 }
 
@@ -18563,7 +18563,7 @@ batteryGroup2AhDischargedMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { batteryGroup2AhDischarged 7 }
 
@@ -18592,7 +18592,7 @@ invertersStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of inverter subsystem."
 	::= { inverters 1 }
 
@@ -18621,7 +18621,7 @@ invertersErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { invertersError 1 }
 
@@ -18629,7 +18629,7 @@ invertersErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the inverter error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersError 2 }
@@ -18638,9 +18638,9 @@ invertersErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersError 3 }
@@ -18652,7 +18652,7 @@ invertersErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersError 4 }
 
@@ -18660,7 +18660,7 @@ invertersErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed inverters."
 	::= { invertersError 5 }
 
@@ -18668,7 +18668,7 @@ invertersErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersError 6 }
 
@@ -18676,7 +18676,7 @@ invertersErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersError 7 }
 
@@ -18705,7 +18705,7 @@ invertersTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the rectifier temperature can be either one of the defined enumerated values"
 	::= { invertersTemperature 1 }
 
@@ -18713,7 +18713,7 @@ invertersTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { invertersTemperature 2 }
@@ -18722,9 +18722,9 @@ invertersTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersTemperature 3 }
@@ -18736,7 +18736,7 @@ invertersTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersTemperature 4 }
 
@@ -18744,7 +18744,7 @@ invertersTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the rectifier temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -18754,7 +18754,7 @@ invertersTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { invertersTemperature 6 }
 
@@ -18762,7 +18762,7 @@ invertersTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { invertersTemperature 7 }
 
@@ -18770,7 +18770,7 @@ invertersTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { invertersTemperature 8 }
 
@@ -18778,7 +18778,7 @@ invertersTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { invertersTemperature 9 }
 
@@ -18807,7 +18807,7 @@ invertersAcCurrent1Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcCurrent1 1 }
 
@@ -18815,7 +18815,7 @@ invertersAcCurrent1Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcCurrent1 2 }
@@ -18824,9 +18824,9 @@ invertersAcCurrent1TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcCurrent1 3 }
@@ -18838,7 +18838,7 @@ invertersAcCurrent1AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcCurrent1 4 }
 
@@ -18846,7 +18846,7 @@ invertersAcCurrent1Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcCurrent1 5 }
 
@@ -18854,7 +18854,7 @@ invertersAcCurrent1MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcCurrent1 6 }
 
@@ -18862,7 +18862,7 @@ invertersAcCurrent1MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcCurrent1 7 }
 
@@ -18891,7 +18891,7 @@ invertersAcCurrent2Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcCurrent2 1 }
 
@@ -18899,7 +18899,7 @@ invertersAcCurrent2Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcCurrent2 2 }
@@ -18908,9 +18908,9 @@ invertersAcCurrent2TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcCurrent2 3 }
@@ -18922,7 +18922,7 @@ invertersAcCurrent2AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcCurrent2 4 }
 
@@ -18930,7 +18930,7 @@ invertersAcCurrent2Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcCurrent2 5 }
 
@@ -18938,7 +18938,7 @@ invertersAcCurrent2MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcCurrent2 6 }
 
@@ -18946,7 +18946,7 @@ invertersAcCurrent2MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcCurrent2 7 }
 
@@ -18975,7 +18975,7 @@ invertersAcCurrent3Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcCurrent3 1 }
 
@@ -18983,7 +18983,7 @@ invertersAcCurrent3Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcCurrent3 2 }
@@ -18992,9 +18992,9 @@ invertersAcCurrent3TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcCurrent3 3 }
@@ -19006,7 +19006,7 @@ invertersAcCurrent3AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcCurrent3 4 }
 
@@ -19014,7 +19014,7 @@ invertersAcCurrent3Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcCurrent3 5 }
 
@@ -19022,7 +19022,7 @@ invertersAcCurrent3MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcCurrent3 6 }
 
@@ -19030,7 +19030,7 @@ invertersAcCurrent3MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcCurrent3 7 }
 
@@ -19059,7 +19059,7 @@ invertersAcVoltage1Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcVoltage1 1 }
 
@@ -19067,7 +19067,7 @@ invertersAcVoltage1Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcVoltage1 2 }
@@ -19076,9 +19076,9 @@ invertersAcVoltage1TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcVoltage1 3 }
@@ -19090,7 +19090,7 @@ invertersAcVoltage1AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcVoltage1 4 }
 
@@ -19098,7 +19098,7 @@ invertersAcVoltage1Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcVoltage1 5 }
 
@@ -19106,7 +19106,7 @@ invertersAcVoltage1MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcVoltage1 6 }
 
@@ -19114,7 +19114,7 @@ invertersAcVoltage1MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage1 7 }
 
@@ -19122,7 +19122,7 @@ invertersAcVoltage1MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage1 8 }
 
@@ -19130,7 +19130,7 @@ invertersAcVoltage1MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage1 9 }
 
@@ -19159,7 +19159,7 @@ invertersAcVoltage2Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcVoltage2 1 }
 
@@ -19167,7 +19167,7 @@ invertersAcVoltage2Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcVoltage2 2 }
@@ -19176,9 +19176,9 @@ invertersAcVoltage2TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcVoltage2 3 }
@@ -19190,7 +19190,7 @@ invertersAcVoltage2AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcVoltage2 4 }
 
@@ -19198,7 +19198,7 @@ invertersAcVoltage2Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcVoltage2 5 }
 
@@ -19206,7 +19206,7 @@ invertersAcVoltage2MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcVoltage2 6 }
 
@@ -19214,7 +19214,7 @@ invertersAcVoltage2MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage2 7 }
 
@@ -19222,7 +19222,7 @@ invertersAcVoltage2MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage2 8 }
 
@@ -19230,7 +19230,7 @@ invertersAcVoltage2MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage2 9 }
 
@@ -19259,7 +19259,7 @@ invertersAcVoltage3Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcVoltage3 1 }
 
@@ -19267,7 +19267,7 @@ invertersAcVoltage3Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcVoltage3 2 }
@@ -19276,9 +19276,9 @@ invertersAcVoltage3TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcVoltage3 3 }
@@ -19290,7 +19290,7 @@ invertersAcVoltage3AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcVoltage3 4 }
 
@@ -19298,7 +19298,7 @@ invertersAcVoltage3Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcVoltage3 5 }
 
@@ -19306,7 +19306,7 @@ invertersAcVoltage3MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcVoltage3 6 }
 
@@ -19314,7 +19314,7 @@ invertersAcVoltage3MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage3 7 }
 
@@ -19322,7 +19322,7 @@ invertersAcVoltage3MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage3 8 }
 
@@ -19330,7 +19330,7 @@ invertersAcVoltage3MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcVoltage3 9 }
 
@@ -19359,7 +19359,7 @@ invertersAcFrequencyDeviationStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { invertersAcFrequencyDeviation 1 }
 
@@ -19367,7 +19367,7 @@ invertersAcFrequencyDeviationDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { invertersAcFrequencyDeviation 2 }
@@ -19376,9 +19376,9 @@ invertersAcFrequencyDeviationTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { invertersAcFrequencyDeviation 3 }
@@ -19390,7 +19390,7 @@ invertersAcFrequencyDeviationAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { invertersAcFrequencyDeviation 4 }
 
@@ -19398,7 +19398,7 @@ invertersAcFrequencyDeviationValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { invertersAcFrequencyDeviation 5 }
 
@@ -19406,7 +19406,7 @@ invertersAcFrequencyDeviationMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcFrequencyDeviation 6 }
 
@@ -19414,7 +19414,7 @@ invertersAcFrequencyDeviationMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcFrequencyDeviation 7 }
 
@@ -19422,7 +19422,7 @@ invertersAcFrequencyDeviationMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { invertersAcFrequencyDeviation 8 }
 
@@ -19430,7 +19430,7 @@ invertersAcFrequencyDeviationMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { invertersAcFrequencyDeviation 9 }
 
@@ -19438,7 +19438,7 @@ invertersAcFrequency  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { inverters 11 }
 
@@ -19467,7 +19467,7 @@ rectivertersStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of rectifier subsystem."
 	::= { rectiverters 1 }
 
@@ -19496,7 +19496,7 @@ rectivertersDcCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersDcCurrent 1 }
 
@@ -19504,7 +19504,7 @@ rectivertersDcCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersDcCurrent 2 }
@@ -19513,9 +19513,9 @@ rectivertersDcCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersDcCurrent 3 }
@@ -19527,7 +19527,7 @@ rectivertersDcCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersDcCurrent 4 }
 
@@ -19535,7 +19535,7 @@ rectivertersDcCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersDcCurrent 5 }
 
@@ -19543,7 +19543,7 @@ rectivertersDcCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersDcCurrent 6 }
 
@@ -19551,7 +19551,7 @@ rectivertersDcCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersDcCurrent 7 }
 
@@ -19580,7 +19580,7 @@ rectivertersErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { rectivertersError 1 }
 
@@ -19588,7 +19588,7 @@ rectivertersErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersError 2 }
@@ -19597,9 +19597,9 @@ rectivertersErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersError 3 }
@@ -19611,7 +19611,7 @@ rectivertersErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersError 4 }
 
@@ -19619,7 +19619,7 @@ rectivertersErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed rectifiers."
 	::= { rectivertersError 5 }
 
@@ -19627,7 +19627,7 @@ rectivertersErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersError 6 }
 
@@ -19635,7 +19635,7 @@ rectivertersErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersError 7 }
 
@@ -19664,7 +19664,7 @@ rectivertersTemperatureStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The state of the rectifier temperature can be either one of the defined enumerated values"
 	::= { rectivertersTemperature 1 }
 
@@ -19672,7 +19672,7 @@ rectivertersTemperatureDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the rectifier temperature monitor. This is stored in the system controller
 		and can be changed by the user. "
 	::= { rectivertersTemperature 2 }
@@ -19681,9 +19681,9 @@ rectivertersTemperatureTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersTemperature 3 }
@@ -19695,7 +19695,7 @@ rectivertersTemperatureAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersTemperature 4 }
 
@@ -19703,7 +19703,7 @@ rectivertersTemperatureValue  OBJECT-TYPE
 	SYNTAX     Integer32 (0..9999)
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The highest value of the rectifier temperature measurements.
 		Depending on the global setting in the Control unit, this value will be presented in Celsius
 		or Fahrenheit."
@@ -19713,7 +19713,7 @@ rectivertersTemperatureMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major high alarm limit"
 	::= { rectivertersTemperature 6 }
 
@@ -19721,7 +19721,7 @@ rectivertersTemperatureMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor high alarm limit"
 	::= { rectivertersTemperature 7 }
 
@@ -19729,7 +19729,7 @@ rectivertersTemperatureMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor low alarm limit"
 	::= { rectivertersTemperature 8 }
 
@@ -19737,7 +19737,7 @@ rectivertersTemperatureMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major low alarm limit"
 	::= { rectivertersTemperature 9 }
 
@@ -19766,7 +19766,7 @@ rectivertersAcOutCurrent1Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent1 1 }
 
@@ -19774,7 +19774,7 @@ rectivertersAcOutCurrent1Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutCurrent1 2 }
@@ -19783,9 +19783,9 @@ rectivertersAcOutCurrent1TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutCurrent1 3 }
@@ -19797,7 +19797,7 @@ rectivertersAcOutCurrent1AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutCurrent1 4 }
 
@@ -19805,7 +19805,7 @@ rectivertersAcOutCurrent1Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent1 5 }
 
@@ -19813,7 +19813,7 @@ rectivertersAcOutCurrent1MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutCurrent1 6 }
 
@@ -19821,7 +19821,7 @@ rectivertersAcOutCurrent1MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutCurrent1 7 }
 
@@ -19850,7 +19850,7 @@ rectivertersAcOutCurrent2Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent2 1 }
 
@@ -19858,7 +19858,7 @@ rectivertersAcOutCurrent2Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutCurrent2 2 }
@@ -19867,9 +19867,9 @@ rectivertersAcOutCurrent2TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutCurrent2 3 }
@@ -19881,7 +19881,7 @@ rectivertersAcOutCurrent2AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutCurrent2 4 }
 
@@ -19889,7 +19889,7 @@ rectivertersAcOutCurrent2Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent2 5 }
 
@@ -19897,7 +19897,7 @@ rectivertersAcOutCurrent2MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutCurrent2 6 }
 
@@ -19905,7 +19905,7 @@ rectivertersAcOutCurrent2MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutCurrent2 7 }
 
@@ -19934,7 +19934,7 @@ rectivertersAcOutCurrent3Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent3 1 }
 
@@ -19942,7 +19942,7 @@ rectivertersAcOutCurrent3Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutCurrent3 2 }
@@ -19951,9 +19951,9 @@ rectivertersAcOutCurrent3TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutCurrent3 3 }
@@ -19965,7 +19965,7 @@ rectivertersAcOutCurrent3AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutCurrent3 4 }
 
@@ -19973,7 +19973,7 @@ rectivertersAcOutCurrent3Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutCurrent3 5 }
 
@@ -19981,7 +19981,7 @@ rectivertersAcOutCurrent3MajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutCurrent3 6 }
 
@@ -19989,7 +19989,7 @@ rectivertersAcOutCurrent3MinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutCurrent3 7 }
 
@@ -20018,7 +20018,7 @@ rectivertersAcOutVoltage1Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage1 1 }
 
@@ -20026,7 +20026,7 @@ rectivertersAcOutVoltage1Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutVoltage1 2 }
@@ -20035,9 +20035,9 @@ rectivertersAcOutVoltage1TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutVoltage1 3 }
@@ -20049,7 +20049,7 @@ rectivertersAcOutVoltage1AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutVoltage1 4 }
 
@@ -20057,7 +20057,7 @@ rectivertersAcOutVoltage1Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage1 5 }
 
@@ -20065,7 +20065,7 @@ rectivertersAcOutVoltage1MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage1 6 }
 
@@ -20073,7 +20073,7 @@ rectivertersAcOutVoltage1MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage1 7 }
 
@@ -20081,7 +20081,7 @@ rectivertersAcOutVoltage1MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage1 8 }
 
@@ -20089,7 +20089,7 @@ rectivertersAcOutVoltage1MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage1 9 }
 
@@ -20118,7 +20118,7 @@ rectivertersAcOutVoltage2Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage2 1 }
 
@@ -20126,7 +20126,7 @@ rectivertersAcOutVoltage2Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutVoltage2 2 }
@@ -20135,9 +20135,9 @@ rectivertersAcOutVoltage2TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutVoltage2 3 }
@@ -20149,7 +20149,7 @@ rectivertersAcOutVoltage2AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutVoltage2 4 }
 
@@ -20157,7 +20157,7 @@ rectivertersAcOutVoltage2Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage2 5 }
 
@@ -20165,7 +20165,7 @@ rectivertersAcOutVoltage2MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage2 6 }
 
@@ -20173,7 +20173,7 @@ rectivertersAcOutVoltage2MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage2 7 }
 
@@ -20181,7 +20181,7 @@ rectivertersAcOutVoltage2MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage2 8 }
 
@@ -20189,7 +20189,7 @@ rectivertersAcOutVoltage2MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage2 9 }
 
@@ -20218,7 +20218,7 @@ rectivertersAcOutVoltage3Status  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage3 1 }
 
@@ -20226,7 +20226,7 @@ rectivertersAcOutVoltage3Description  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcOutVoltage3 2 }
@@ -20235,9 +20235,9 @@ rectivertersAcOutVoltage3TrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcOutVoltage3 3 }
@@ -20249,7 +20249,7 @@ rectivertersAcOutVoltage3AlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcOutVoltage3 4 }
 
@@ -20257,7 +20257,7 @@ rectivertersAcOutVoltage3Value  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcOutVoltage3 5 }
 
@@ -20265,7 +20265,7 @@ rectivertersAcOutVoltage3MajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage3 6 }
 
@@ -20273,7 +20273,7 @@ rectivertersAcOutVoltage3MinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage3 7 }
 
@@ -20281,7 +20281,7 @@ rectivertersAcOutVoltage3MinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcOutVoltage3 8 }
 
@@ -20289,7 +20289,7 @@ rectivertersAcOutVoltage3MajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcOutVoltage3 9 }
 
@@ -20318,7 +20318,7 @@ rectivertersAcFrequencyDeviationStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total rectifier current."
 	::= { rectivertersAcFrequencyDeviation 1 }
 
@@ -20326,7 +20326,7 @@ rectivertersAcFrequencyDeviationDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total rectifier current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { rectivertersAcFrequencyDeviation 2 }
@@ -20335,9 +20335,9 @@ rectivertersAcFrequencyDeviationTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { rectivertersAcFrequencyDeviation 3 }
@@ -20349,7 +20349,7 @@ rectivertersAcFrequencyDeviationAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { rectivertersAcFrequencyDeviation 4 }
 
@@ -20357,7 +20357,7 @@ rectivertersAcFrequencyDeviationValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total rectifier current."
 	::= { rectivertersAcFrequencyDeviation 5 }
 
@@ -20365,7 +20365,7 @@ rectivertersAcFrequencyDeviationMajorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { rectivertersAcFrequencyDeviation 6 }
 
@@ -20373,7 +20373,7 @@ rectivertersAcFrequencyDeviationMinorHighLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcFrequencyDeviation 7 }
 
@@ -20381,7 +20381,7 @@ rectivertersAcFrequencyDeviationMinorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcFrequencyDeviation 8 }
 
@@ -20389,7 +20389,7 @@ rectivertersAcFrequencyDeviationMajorLowLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { rectivertersAcFrequencyDeviation 9 }
 
@@ -20397,7 +20397,7 @@ rectivertersAcFrequency  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { rectiverters 12 }
 
@@ -20405,7 +20405,7 @@ rectivertersAcOutVoltageConfig  OBJECT-TYPE
 	SYNTAX     Integer32 (190..250)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Set ac output voltage"
 	::= { rectiverters 13 }
 
@@ -20413,7 +20413,7 @@ rectivertersAcOutFrequencyConfig  OBJECT-TYPE
 	SYNTAX     Integer32 (4500..10600)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Set ac output frequency. Scale is 0.01 Hz."
 	::= { rectiverters 14 }
 
@@ -20442,7 +20442,7 @@ fuelCellsStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of fuel cell charger subsystem."
 	::= { fuelCells 1 }
 
@@ -20471,7 +20471,7 @@ fuelCellsCurrentStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total fuel cell current."
 	::= { fuelCellsCurrent 1 }
 
@@ -20479,7 +20479,7 @@ fuelCellsCurrentDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total fuel cell current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { fuelCellsCurrent 2 }
@@ -20488,9 +20488,9 @@ fuelCellsCurrentTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { fuelCellsCurrent 3 }
@@ -20502,7 +20502,7 @@ fuelCellsCurrentAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { fuelCellsCurrent 4 }
 
@@ -20510,7 +20510,7 @@ fuelCellsCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total fuel cell current."
 	::= { fuelCellsCurrent 5 }
 
@@ -20518,7 +20518,7 @@ fuelCellsCurrentMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { fuelCellsCurrent 6 }
 
@@ -20526,7 +20526,7 @@ fuelCellsCurrentMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { fuelCellsCurrent 7 }
 
@@ -20555,7 +20555,7 @@ fuelCellsPowerStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The status of the measured total fuel cell power."
 	::= { fuelCellsPower 1 }
 
@@ -20563,7 +20563,7 @@ fuelCellsPowerDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the total fuel cell current monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { fuelCellsPower 2 }
@@ -20572,9 +20572,9 @@ fuelCellsPowerTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { fuelCellsPower 3 }
@@ -20586,7 +20586,7 @@ fuelCellsPowerAlarmEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { fuelCellsPower 4 }
 
@@ -20594,7 +20594,7 @@ fuelCellsPowerValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The value of the measured total fuel cell power."
 	::= { fuelCellsPower 5 }
 
@@ -20602,7 +20602,7 @@ fuelCellsPowerMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { fuelCellsPower 6 }
 
@@ -20610,7 +20610,7 @@ fuelCellsPowerMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { fuelCellsPower 7 }
 
@@ -20639,7 +20639,7 @@ fuelCellsErrorStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This status value shows if the number of failed units is higher than the defined alarm level."
 	::= { fuelCellsError 1 }
 
@@ -20647,7 +20647,7 @@ fuelCellsErrorDescription  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..16))
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"A textual description of the fuel cell error monitor. This is stored in the system controller
 		and can be changed by the user"
 	::= { fuelCellsError 2 }
@@ -20656,9 +20656,9 @@ fuelCellsErrorTrapRepeatCounter  OBJECT-TYPE
 	SYNTAX     Counter32
 	MAX-ACCESS accessible-for-notify
 	STATUS     current
-	DESCRIPTION 
-		"The number of consecutive times this alamcondition has been transmitted in a trap. 
-		When trap repetition is enabled, this counter increments every time this trap is repeated.  
+	DESCRIPTION
+		"The number of consecutive times this alamcondition has been transmitted in a trap.
+		When trap repetition is enabled, this counter increments every time this trap is repeated.
 		The counter is automatically set to zero when the alarm condition is reset and the
 		alarm goes off"
 	::= { fuelCellsError 3 }
@@ -20670,7 +20670,7 @@ fuelCellsErrorEnable  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This value once enabled, the alarm condition of the monitor will be reported."
 	::= { fuelCellsError 4 }
 
@@ -20678,7 +20678,7 @@ fuelCellsErrorValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The number of failed fuel cell chargers."
 	::= { fuelCellsError 5 }
 
@@ -20686,7 +20686,7 @@ fuelCellsErrorMajorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The major alarm limit"
 	::= { fuelCellsError 6 }
 
@@ -20694,7 +20694,7 @@ fuelCellsErrorMinorAlarmLevel  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The minor alarm limit"
 	::= { fuelCellsError 7 }
 
@@ -20702,7 +20702,7 @@ fuelCellsNumberOfFuelCells  OBJECT-TYPE
 	SYNTAX     Integer32 (0..100)
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Number of installed fuel cell chargers."
 	::= { fuelCells 5 }
 
@@ -20710,7 +20710,7 @@ fuelCellTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FuelCellEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table shows the information of each fuel cell installed in the system."
 	::= { fuelCells 6 }
 
@@ -20718,7 +20718,7 @@ fuelCellEntry  OBJECT-TYPE
 	SYNTAX 	FuelCellEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { fuelCellIndex }
 	::= { fuelCellTable 1 }
@@ -20782,7 +20782,7 @@ fuelCellIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..100)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..100 of fuelCellTable"
 	::= { fuelCellEntry 1 }
 
@@ -20885,7 +20885,7 @@ fuelCellStatus  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The overall status of fuel cell."
 	::= { fuelCellEntry 2 }
 
@@ -20905,7 +20905,7 @@ fuelCellMode  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The mode value of fuel cell."
 	::= { fuelCellEntry 3 }
 
@@ -20913,7 +20913,7 @@ fuelCellCurrentValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The output current value of fuel cell."
 	::= { fuelCellEntry 4 }
 
@@ -20921,7 +20921,7 @@ fuelCellVoltageValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of fuel cell."
 	::= { fuelCellEntry 5 }
 
@@ -20929,7 +20929,7 @@ fuelCellPowerValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The input voltage value of fuel cell."
 	::= { fuelCellEntry 6 }
 
@@ -20937,7 +20937,7 @@ fuelCellType  OBJECT-TYPE
 	SYNTAX     DisplayString (SIZE(0..27))
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Type of fuel cell"
 	::= { fuelCellEntry 7 }
 
@@ -20945,7 +20945,7 @@ fuelCellInletTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The inlet temp value of fuel cell."
 	::= { fuelCellEntry 8 }
 
@@ -20953,7 +20953,7 @@ fuelCellOutletTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The outlet temp value of fuel cell."
 	::= { fuelCellEntry 9 }
 
@@ -20961,7 +20961,7 @@ fuelCellRoomTemperature  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The room temp value of fuel cell."
 	::= { fuelCellEntry 10 }
 
@@ -20969,7 +20969,7 @@ fuelCellFan  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The fan value of fuel cell."
 	::= { fuelCellEntry 11 }
 
@@ -20980,7 +20980,7 @@ fuelCellH2Storage1  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The H2 storage 1 value of fuel cell."
 	::= { fuelCellEntry 12 }
 
@@ -20991,7 +20991,7 @@ fuelCellH2Storage2  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The H2 storage 2 value of fuel cell."
 	::= { fuelCellEntry 13 }
 
@@ -21002,7 +21002,7 @@ fuelCellH2Storage3  OBJECT-TYPE
 	}
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The H2 storage 3 value of fuel cell."
 	::= { fuelCellEntry 14 }
 
@@ -21010,7 +21010,7 @@ fuelCellDO22  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO22 value of fuel cell."
 	::= { fuelCellEntry 15 }
 
@@ -21018,7 +21018,7 @@ fuelCellDO23  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO23 value of fuel cell."
 	::= { fuelCellEntry 16 }
 
@@ -21026,7 +21026,7 @@ fuelCellDO24  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO24 value of fuel cell."
 	::= { fuelCellEntry 17 }
 
@@ -21034,7 +21034,7 @@ fuelCellDO25  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO25 value of fuel cell."
 	::= { fuelCellEntry 18 }
 
@@ -21042,7 +21042,7 @@ fuelCellDO26  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO26 value of fuel cell."
 	::= { fuelCellEntry 19 }
 
@@ -21050,7 +21050,7 @@ fuelCellDO27  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DO27 value of fuel cell."
 	::= { fuelCellEntry 20 }
 
@@ -21058,7 +21058,7 @@ fuelCellDC1current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC1 current value of fuel cell."
 	::= { fuelCellEntry 21 }
 
@@ -21066,7 +21066,7 @@ fuelCellDC2current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC2 current value of fuel cell."
 	::= { fuelCellEntry 22 }
 
@@ -21074,7 +21074,7 @@ fuelCellDC3current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC3 current value of fuel cell."
 	::= { fuelCellEntry 23 }
 
@@ -21082,7 +21082,7 @@ fuelCellDC4current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC4 current value of fuel cell."
 	::= { fuelCellEntry 24 }
 
@@ -21090,7 +21090,7 @@ fuelCellDC5current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC5 current value of fuel cell."
 	::= { fuelCellEntry 25 }
 
@@ -21098,7 +21098,7 @@ fuelCellDC6current  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The DC6 current value of fuel cell."
 	::= { fuelCellEntry 26 }
 
@@ -21106,7 +21106,7 @@ fuelCellsEnergyLogAccumulated  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the accumulated energy delivered from fuel cell."
 	::= { fuelCellsEnergyLog 1 }
 
@@ -21114,7 +21114,7 @@ fuelCellsEnergyLogLastHoursNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in fuel cell hourly energy log."
 	::= { fuelCellsEnergyLog 2 }
 
@@ -21122,7 +21122,7 @@ fuelCellsEnergyLogLastHoursTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FuelCellsEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains hourly energy log of fuel cell."
 	::= { fuelCellsEnergyLog 3 }
 
@@ -21130,7 +21130,7 @@ fuelCellsEnergyLogLastHoursEntry  OBJECT-TYPE
 	SYNTAX 	FuelCellsEnergyLogLastHoursEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { fuelCellsEnergyLogLastHoursIndex }
 	::= { fuelCellsEnergyLogLastHoursTable 1 }
@@ -21146,7 +21146,7 @@ fuelCellsEnergyLogLastHoursIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of fuelCellsEnergyLogLastHoursTable"
 	::= { fuelCellsEnergyLogLastHoursEntry 1 }
 
@@ -21154,7 +21154,7 @@ fuelCellsEnergyLogLastHoursValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every hour."
 	::= { fuelCellsEnergyLogLastHoursEntry 2 }
 
@@ -21162,7 +21162,7 @@ fuelCellsEnergyLogLastDaysNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in fuel cell daily energy log."
 	::= { fuelCellsEnergyLog 4 }
 
@@ -21170,7 +21170,7 @@ fuelCellsEnergyLogLastDaysTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FuelCellsEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains daily energy log of fuel cell."
 	::= { fuelCellsEnergyLog 5 }
 
@@ -21178,7 +21178,7 @@ fuelCellsEnergyLogLastDaysEntry  OBJECT-TYPE
 	SYNTAX 	FuelCellsEnergyLogLastDaysEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { fuelCellsEnergyLogLastDaysIndex }
 	::= { fuelCellsEnergyLogLastDaysTable 1 }
@@ -21194,7 +21194,7 @@ fuelCellsEnergyLogLastDaysIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of fuelCellsEnergyLogLastDaysTable"
 	::= { fuelCellsEnergyLogLastDaysEntry 1 }
 
@@ -21202,7 +21202,7 @@ fuelCellsEnergyLogLastDaysValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every day."
 	::= { fuelCellsEnergyLogLastDaysEntry 2 }
 
@@ -21210,7 +21210,7 @@ fuelCellsEnergyLogLastWeeksNumberOfEntries  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This is the maximal number of entries stored in fuel cell weekly energy log."
 	::= { fuelCellsEnergyLog 6 }
 
@@ -21218,7 +21218,7 @@ fuelCellsEnergyLogLastWeeksTable  OBJECT-TYPE
 	SYNTAX SEQUENCE OF FuelCellsEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"This table contains weekly energy log of fuel cell."
 	::= { fuelCellsEnergyLog 7 }
 
@@ -21226,7 +21226,7 @@ fuelCellsEnergyLogLastWeeksEntry  OBJECT-TYPE
 	SYNTAX 	FuelCellsEnergyLogLastWeeksEntry
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	INDEX { fuelCellsEnergyLogLastWeeksIndex }
 	::= { fuelCellsEnergyLogLastWeeksTable 1 }
@@ -21242,7 +21242,7 @@ fuelCellsEnergyLogLastWeeksIndex  OBJECT-TYPE
 	SYNTAX     Integer32 (1..52)
 	MAX-ACCESS not-accessible
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Index used for navigating the rows 1..52 of fuelCellsEnergyLogLastWeekTable"
 	::= { fuelCellsEnergyLogLastWeeksEntry 1 }
 
@@ -21250,7 +21250,7 @@ fuelCellsEnergyLogLastWeeksValue  OBJECT-TYPE
 	SYNTAX     Integer32
 	MAX-ACCESS read-only
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"Energy value logged every week."
 	::= { fuelCellsEnergyLogLastWeeksEntry 2 }
 
@@ -21261,7 +21261,7 @@ fuelCellsReset  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { fuelCells 8 }
 
@@ -21272,7 +21272,7 @@ fuelCellsUnlock  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { fuelCells 9 }
 
@@ -21283,29 +21283,29 @@ fuelCellsSelfTest  OBJECT-TYPE
 	}
 	MAX-ACCESS read-write
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		""
 	::= { fuelCells 10 }
 
 powerSystemTrapsGroup  NOTIFICATION-GROUP
-	NOTIFICATIONS { alarmBatteryTrap, 
-		alarmControlSystemTrap, 
-		alarmDcDcTrap, 
-		alarmGeneratorTrap, 
-		alarmInputsTrap, 
-		alarmInverterTrap, 
-		alarmLoadGroupTrap, 
-		alarmMainsTrap, 
-		alarmOutputsTrap, 
-		alarmPowerSystemTrap, 
-		alarmRectifierTrap, 
-		alarmRectiverterTrap, 
-		alarmSolarChargerTrap, 
-		alarmWindChargerTrap, 
-		infoBatteryTestTrap, 
+	NOTIFICATIONS { alarmBatteryTrap,
+		alarmControlSystemTrap,
+		alarmDcDcTrap,
+		alarmGeneratorTrap,
+		alarmInputsTrap,
+		alarmInverterTrap,
+		alarmLoadGroupTrap,
+		alarmMainsTrap,
+		alarmOutputsTrap,
+		alarmPowerSystemTrap,
+		alarmRectifierTrap,
+		alarmRectiverterTrap,
+		alarmSolarChargerTrap,
+		alarmWindChargerTrap,
+		infoBatteryTestTrap,
 		alarmFuelCellTrap }
 	STATUS     current
-	DESCRIPTION 
+	DESCRIPTION
 		"The powerSystem Trap goup. Entry point for the trap list."
 	::= { eltekTraps 3 }
 END
@@ -21313,4 +21313,3 @@ END
 
 -- This MIB was created using NuDesign Team's Visual MIBuilder (Ver 4.4).
 -- EOF EltekSmartPack2-1.1.mib
-
diff --git a/tangostationcontrol/tangostationcontrol/devices/mibs/__init__.py b/tangostationcontrol/devices/mibs/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/mibs/__init__.py
rename to tangostationcontrol/devices/mibs/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/devices/observation_control.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/observation_control.py
rename to tangostationcontrol/devices/observation_control.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_field.py b/tangostationcontrol/devices/observation_field.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/observation_field.py
rename to tangostationcontrol/devices/observation_field.py
index e3474c436d8f6d0bd0d1ff9c5766929819e6c9d8..904e54370ac12b6fc0a9bebd6b8a099243a79eda 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_field.py
+++ b/tangostationcontrol/devices/observation_field.py
@@ -552,7 +552,6 @@ class ObservationField(LOFARDevice):
     def _apply_xst_subband_select(
         self, subbands: List[int], subbands_step: int
     ) -> numpy.ndarray:
-
         if len(subbands) > MAX_PARALLEL_SUBBANDS:
             raise ValueError(
                 f"Requested more than {MAX_PARALLEL_SUBBANDS} subbands for the XSTs: {subbands}"
diff --git a/tangostationcontrol/tangostationcontrol/devices/pcon.py b/tangostationcontrol/devices/pcon.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/pcon.py
rename to tangostationcontrol/devices/pcon.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/protection_control.py b/tangostationcontrol/devices/protection_control.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/protection_control.py
rename to tangostationcontrol/devices/protection_control.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv/__init__.py b/tangostationcontrol/devices/recv/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/recv/__init__.py
rename to tangostationcontrol/devices/recv/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv/recvh.py b/tangostationcontrol/devices/recv/recvh.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/recv/recvh.py
rename to tangostationcontrol/devices/recv/recvh.py
index 0716fe2b57379e0e963ab33189f951564647182b..293677e5503cc4a27530a37eb4a214c8c08a21e4 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv/recvh.py
+++ b/tangostationcontrol/devices/recv/recvh.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """Receiver Unit High Device Server for LOFAR2.0"""
+
 import logging
 
 import numpy
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv/recvl.py b/tangostationcontrol/devices/recv/recvl.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/recv/recvl.py
rename to tangostationcontrol/devices/recv/recvl.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/__init__.py b/tangostationcontrol/devices/sdp/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/__init__.py
rename to tangostationcontrol/devices/sdp/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py b/tangostationcontrol/devices/sdp/beamlet.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
rename to tangostationcontrol/devices/sdp/beamlet.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py b/tangostationcontrol/devices/sdp/bst.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
rename to tangostationcontrol/devices/sdp/bst.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py b/tangostationcontrol/devices/sdp/digitalbeam.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
rename to tangostationcontrol/devices/sdp/digitalbeam.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/firmware.py b/tangostationcontrol/devices/sdp/firmware.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/firmware.py
rename to tangostationcontrol/devices/sdp/firmware.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py b/tangostationcontrol/devices/sdp/sdp.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
rename to tangostationcontrol/devices/sdp/sdp.py
index 7bce1a5b52d371305ed1a7240d7dbc24f2374de3..4d70de0ba2c55d0cbbc16df92f154b09ebdc391a 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+++ b/tangostationcontrol/devices/sdp/sdp.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """SDP Device Server for LOFAR2.0"""
+
 import time
 from typing import Dict, List, Tuple
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py b/tangostationcontrol/devices/sdp/sst.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
rename to tangostationcontrol/devices/sdp/sst.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py b/tangostationcontrol/devices/sdp/statistics.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
rename to tangostationcontrol/devices/sdp/statistics.py
index 45deb68ec87cf425956b48b5a4aef59e1a24d430..9df897b95477916dee6b1b064541d2dbb00509ef 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
+++ b/tangostationcontrol/devices/sdp/statistics.py
@@ -88,7 +88,6 @@ class Statistics(OPCUADevice):
     def _statistics_defaults(
         self, statistics_type: str, properties: Dict[str, object]
     ) -> Dict[str, object]:
-
         host = properties["Statistics_Client_Hostname"]
         ip = ipaddress.IPv4Address(socket.gethostbyname(host))
         mac = properties["Statistics_Client_MAC_prefix"] + self._ip_to_hex(ip)
@@ -218,8 +217,8 @@ class Statistics(OPCUADevice):
         except zmq.ContextTerminated:
             # beneign exception from a forced stop
             logger.debug("ZeroMQ message handler ZMQ context terminated")
-        except Exception as ex:
-            logger.exception(f"Error handling ZeroMQ messages")
+        except Exception:
+            logger.exception("Error handling ZeroMQ messages")
 
         logger.debug("ZeroMQ message handler thread stopped")
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/xst.py b/tangostationcontrol/devices/sdp/xst.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/sdp/xst.py
rename to tangostationcontrol/devices/sdp/xst.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/station_manager.py b/tangostationcontrol/devices/station_manager.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/station_manager.py
rename to tangostationcontrol/devices/station_manager.py
index a75470fb39a5d6c06f2b2103b6a821287f8f155e..7f2e09f3dde426ddae31399e1106f7565c2826c7 100644
--- a/tangostationcontrol/tangostationcontrol/devices/station_manager.py
+++ b/tangostationcontrol/devices/station_manager.py
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """StationManager Device Server for LOFAR2.0"""
+
 import asyncio
 import logging
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/tilebeam.py b/tangostationcontrol/devices/tilebeam.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/tilebeam.py
rename to tangostationcontrol/devices/tilebeam.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/types.py b/tangostationcontrol/devices/types.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/types.py
rename to tangostationcontrol/devices/types.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/devices/unb2.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/unb2.py
rename to tangostationcontrol/devices/unb2.py
diff --git a/tangostationcontrol/docs/docs-requirements.txt b/tangostationcontrol/docs/docs-requirements.txt
deleted file mode 100644
index 3a910678911865bf529d594c626ee1d8c2c5860e..0000000000000000000000000000000000000000
--- a/tangostationcontrol/docs/docs-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
-sphinx>=4.3.2 # BSD
-sphinx-rtd-theme>=1.0.0 # MIT
\ No newline at end of file
diff --git a/tangostationcontrol/tangostationcontrol/metadata/__init__.py b/tangostationcontrol/metadata/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/metadata/__init__.py
rename to tangostationcontrol/metadata/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/metadata/metadata_organizer.py b/tangostationcontrol/metadata/metadata_organizer.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/metadata/metadata_organizer.py
rename to tangostationcontrol/metadata/metadata_organizer.py
index 5384e322f2963160fa74797a9459bf0a455a3a7d..a161be6a66a5e5b86f30aa6184aa7a31dadeee5f 100644
--- a/tangostationcontrol/tangostationcontrol/metadata/metadata_organizer.py
+++ b/tangostationcontrol/metadata/metadata_organizer.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """Metadata class organize gathering and managing metadata"""
+
 from datetime import datetime, timezone
 import json
 from typing import Any
diff --git a/tangostationcontrol/tangostationcontrol/metrics/__init__.py b/tangostationcontrol/metrics/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/metrics/__init__.py
rename to tangostationcontrol/metrics/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/metrics/_decorators.py b/tangostationcontrol/metrics/_decorators.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/metrics/_decorators.py
rename to tangostationcontrol/metrics/_decorators.py
diff --git a/tangostationcontrol/tangostationcontrol/metrics/_metrics.py b/tangostationcontrol/metrics/_metrics.py
similarity index 97%
rename from tangostationcontrol/tangostationcontrol/metrics/_metrics.py
rename to tangostationcontrol/metrics/_metrics.py
index 7aa190920508a84003e7008ae8824f1b46b3e6e6..7cfd27703429edb4f62dfa8395246ea82ee63990 100644
--- a/tangostationcontrol/tangostationcontrol/metrics/_metrics.py
+++ b/tangostationcontrol/metrics/_metrics.py
@@ -45,7 +45,7 @@ def wrap_method(
     if not double_wrap and hasattr(func, "__wrapped__"):
         return
 
-    if type(func) == str:
+    if type(func) is str:
         func_name = func
         func = getattr(obj, func_name)
     else:
@@ -132,9 +132,9 @@ class AttributeMetric:
             METRICS[self.name] = self.make_metric()
 
         self.metric = METRICS[self.name]
-        assert (
-            self.metric.__class__ == metric_class
-        ), f"Metric {self.name} was previously provided as {self.metric.__class__} but is now needed as {metric_class}"
+        assert self.metric.__class__ == metric_class, (
+            f"Metric {self.name} was previously provided as {self.metric.__class__} but is now needed as {metric_class}"
+        )
 
     def __str__(self):
         return f"{self.__class__.__name__}(name={self.name}, metric_class={self.metric_class}, static_labels={self.static_label_keys}, dynamic_labels={self.dynamic_label_keys})"
@@ -264,7 +264,7 @@ class ScalarAttributeMetric(AttributeMetric):
                 value = read_func_wrapper.return_value
 
                 self.set_value(value)
-            except Exception as e:
+            except Exception:
                 logger.exception(
                     f"Metrics: error updating metrics for {name} after reading it"
                 )
@@ -280,7 +280,7 @@ class ScalarAttributeMetric(AttributeMetric):
             try:
                 value = self.attribute.get_write_value()
                 self.set_value(value)
-            except Exception as e:
+            except Exception:
                 logger.exception(
                     f"Metrics: error updating metrics for {name} after writing it"
                 )
diff --git a/tangostationcontrol/tangostationcontrol/observation/__init__.py b/tangostationcontrol/observation/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/observation/__init__.py
rename to tangostationcontrol/observation/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/observation/observation.py b/tangostationcontrol/observation/observation.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/observation/observation.py
rename to tangostationcontrol/observation/observation.py
diff --git a/tangostationcontrol/tangostationcontrol/observation/observation_callback.py b/tangostationcontrol/observation/observation_callback.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/observation/observation_callback.py
rename to tangostationcontrol/observation/observation_callback.py
diff --git a/tangostationcontrol/tangostationcontrol/observation/observation_controller.py b/tangostationcontrol/observation/observation_controller.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/observation/observation_controller.py
rename to tangostationcontrol/observation/observation_controller.py
diff --git a/tangostationcontrol/tangostationcontrol/observation/observation_field.py b/tangostationcontrol/observation/observation_field.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/observation/observation_field.py
rename to tangostationcontrol/observation/observation_field.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/__init__.py b/tangostationcontrol/protection/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/protection/__init__.py
rename to tangostationcontrol/protection/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/config_types.py b/tangostationcontrol/protection/config_types.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/protection/config_types.py
rename to tangostationcontrol/protection/config_types.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/metrics.py b/tangostationcontrol/protection/metrics.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/protection/metrics.py
rename to tangostationcontrol/protection/metrics.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/protection_manager.py b/tangostationcontrol/protection/protection_manager.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/protection/protection_manager.py
rename to tangostationcontrol/protection/protection_manager.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/state.py b/tangostationcontrol/protection/state.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/protection/state.py
rename to tangostationcontrol/protection/state.py
diff --git a/tangostationcontrol/tangostationcontrol/protection/threshold.py b/tangostationcontrol/protection/threshold.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/protection/threshold.py
rename to tangostationcontrol/protection/threshold.py
index 4ffce522c42fc5b0fc091325e0519d8cafaa0f75..2198d94ad588ee5bbc62d09d901c78aee2af9497 100644
--- a/tangostationcontrol/tangostationcontrol/protection/threshold.py
+++ b/tangostationcontrol/protection/threshold.py
@@ -18,7 +18,6 @@ class IProtectionThreshold(abc.ABC):
 
 
 class NumberProtectionThreshold(IProtectionThreshold):
-
     def __init__(self, minimal: numbers.Real, maximum: numbers.Real):
         self._min = minimal
         self._max = maximum
diff --git a/tangostationcontrol/proto/README.md b/tangostationcontrol/proto/README.md
deleted file mode 100644
index 42f5d292ac169bd47ab64000d8c355c3bc96a3f4..0000000000000000000000000000000000000000
--- a/tangostationcontrol/proto/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Protobuf definitions for the RPC services in the tangostationcontrol.rpc module.
-
-`grafana-apiv3.proto` is taken from https://raw.githubusercontent.com/innius/grafana-simple-grpc-datasource/master/pkg/proto/v3/apiv3.proto
diff --git a/tangostationcontrol/proto/antennafield.proto b/tangostationcontrol/proto/antennafield.proto
deleted file mode 100644
index c4f92628e48c51812dbe2d968612576903015228..0000000000000000000000000000000000000000
--- a/tangostationcontrol/proto/antennafield.proto
+++ /dev/null
@@ -1,57 +0,0 @@
-syntax = "proto3";
-
-service Antennafield {
-  rpc GetAntenna(GetAntennaRequest) returns (AntennaReply) {}
-  rpc SetAntennaStatus(SetAntennaStatusRequest) returns (AntennaReply) {}
-  rpc SetAntennaUse(SetAntennaUseRequest) returns (AntennaReply) {}
-}
-
-enum Antenna_Status {
-  OK = 0;
-  SUSPICIOUS = 1;
-  BROKEN = 2;
-  BEYOND_REPAIR = 3;
-  NOT_AVAILABLE = 4;
-}
-
-enum Antenna_Use {
-  // use antenna only if it's OK or SUSPICIOUS
-  AUTO = 0;
-  // force antenna to be on, regardless of status
-  ON = 1;
-  // force antenna to be off, regardless of status
-  OFF = 2;
-}
-
-message Identifier {
-  // e.g. "LBA"
-  string antennafield_name = 1;
-  // e.g. "LBA00"
-  string antenna_name = 2;
-}
-
-message SetAntennaStatusRequest {
-  Identifier identifier = 1;
-  Antenna_Status antenna_status = 2 ;
-}
-
-message GetAntennaRequest {
-  Identifier identifier = 1;
-}
-
-message SetAntennaUseRequest {
-  Identifier identifier = 1;
-  Antenna_Use antenna_use = 2;
-}
-
-message AntennaResult {
-  Identifier identifier = 1;
-  Antenna_Use antenna_use = 2;
-  Antenna_Status antenna_status = 3;
-}
-
-message AntennaReply {
-  bool success = 1;
-  string exception = 2;
-  AntennaResult result = 3;
-}
diff --git a/tangostationcontrol/proto/grafana-apiv3.proto b/tangostationcontrol/proto/grafana-apiv3.proto
deleted file mode 100644
index 01a960b09e990cee7881c7a5f22576745f9f75fb..0000000000000000000000000000000000000000
--- a/tangostationcontrol/proto/grafana-apiv3.proto
+++ /dev/null
@@ -1,360 +0,0 @@
-syntax = "proto3";
-
-option go_package = "bitbucket.org/innius/grafana-simple-grpc-datasource/v3";
-
-import "google/protobuf/timestamp.proto";
-
-package grafanav3;
-
-// The GrafanaQueryAPI definition.
-service GrafanaQueryAPI {
-  // Returns a list of all available dimensions
-  rpc ListDimensionKeys (ListDimensionKeysRequest) returns (ListDimensionKeysResponse) {
-  }
-
-  // Returns a list of all dimension values for a certain dimension
-  rpc ListDimensionValues (ListDimensionValuesRequest) returns (ListDimensionValuesResponse) {
-  }
-
-  // Returns all metrics from the system
-  rpc ListMetrics (ListMetricsRequest) returns (ListMetricsResponse) {
-  }
-
-  // Gets the options for the specified query type
-  rpc GetQueryOptions (GetOptionsRequest) returns (GetOptionsResponse) {
-
-  }
-
-  // Gets the last known value for one or more metrics
-  rpc GetMetricValue (GetMetricValueRequest) returns (GetMetricValueResponse) {
-  }
-
-  // Gets the history for one or more metrics
-  rpc GetMetricHistory (GetMetricHistoryRequest) returns (GetMetricHistoryResponse) {
-  }
-
-  // Gets the history for one or more metrics
-  rpc GetMetricAggregate(GetMetricAggregateRequest) returns (GetMetricAggregateResponse) {
-  }
-}
-
-message ListMetricsRequest {
-  repeated Dimension dimensions = 1;
-  string filter = 2;
-}
-
-message ListMetricsResponse {
-  message Metric {
-    string name = 1;
-    string description = 2;
-  }
-  repeated Metric Metrics = 1;
-}
-
-message GetMetricValueRequest {
-  repeated Dimension dimensions = 1;
-
-  repeated string metrics = 2;
-
-  map<string,string> options = 3 ;
-
-  google.protobuf.Timestamp startDate = 4;
-  google.protobuf.Timestamp endDate = 5;
-}
-
-message GetMetricValueResponse {
-  message Frame {
-    string metric = 1;
-
-    google.protobuf.Timestamp timestamp = 2;
-
-    repeated SingleValueField fields = 3;
-
-    FrameMeta meta = 4;
-  }
-
-  repeated Frame frames = 1;
-}
-
-message GetOptionsRequest {
-  enum QueryType {
-    GetMetricHistory = 0;
-    GetMetricValue=1;
-    GetMetricAggregate=2;
-  }
-  // the query type for which options are requested
-  QueryType queryType = 1;
-
-  // the query options which are currently selected 
-  map<string,string> selectedOptions = 2 ;
-}
-
-message EnumValue {
-  // the id of the enum value 
-  string id = 1;
-  // the description of the option
-  string description = 2;
-  // the label of the option 
-  string label = 3;
-  // the default enum value
-  bool default = 4;
-}
-
-message Option {
-  // the id of the option 
-  string id = 1; 
-  string description = 2;
-  enum Type {
-    Enum = 0; // enum is rendered as a Select control in the frontend 
-    Boolean = 1;
-  }
-  Type  type = 3; 
-  repeated EnumValue enumValues = 4;
-  bool required = 5; 
-  // the label of the option 
-  string label = 6;
-}
-
-message GetOptionsResponse {
-  repeated Option options = 1;
-}
-
-message GetMetricAggregateRequest {
-  // The dimensions for the query
-  repeated Dimension dimensions = 1;
-
-  // the metrics for which the aggregates are retrieved
-  repeated string metrics = 2;
-
-  google.protobuf.Timestamp startDate = 4;
-  google.protobuf.Timestamp endDate = 5;
-  int64 maxItems = 6;
-  TimeOrdering timeOrdering = 7;
-  string startingToken = 8;
-  int64 intervalMs = 9;
-  map<string,string> options = 10 ;
-}
-
-message GetMetricAggregateResponse {
-  repeated Frame frames = 1;
-
-  string nextToken = 2;
-}
-
-message GetMetricHistoryRequest {
-  repeated Dimension dimensions = 3;
-  repeated string metrics = 4;
-  google.protobuf.Timestamp startDate = 5;
-  google.protobuf.Timestamp endDate = 6;
-  int64 maxItems = 7;
-  TimeOrdering timeOrdering = 8;
-  string startingToken = 9;
-  map<string,string> options = 10 ;
-}
-
-message GetMetricHistoryResponse {
-  repeated Frame frames = 1;
-
-  string nextToken = 2;
-}
-
-message Label {
-  string key = 1;
-  string value = 2;
-}
-
-message Field {
-  string name = 1;
-
-  repeated Label labels = 2;
-
-  config config = 3;
-
-  repeated double values = 4;
-  repeated string stringValues = 5;
-}
-
-message ValueMapping {
-  double from = 1;
-  double to = 2; 
-  string value = 3; 
-  string text = 4;
-  string color = 5;
-}
-
-message config {
-  string unit = 1;
-
-  repeated ValueMapping Mappings = 2;
-}
-
-message SingleValueField {
-  string name = 1;
-
-  repeated Label labels = 2;
-
-  config config = 3;
-
-  double value = 4;
-
-  string stringValue = 5;
-}
-
-// The data frame for each metric
-message Frame {
-  string metric = 1;
-
-  repeated google.protobuf.Timestamp timestamps = 2;
-
-  repeated Field fields = 3;
-
-  FrameMeta meta = 4;
-}
-
-// FrameMeta matches:
-// https://github.com/grafana/grafana/blob/master/packages/grafana-data/src/types/data.ts#L11
-// NOTE -- in javascript this can accept any `[key: string]: any;` however
-// this interface only exposes the values we want to be exposed
-message FrameMeta {
-  enum FrameType {
-    FrameTypeUnknown = 0;
-    FrameTypeTimeSeriesWide = 1;
-    FrameTypeTimeSeriesLong = 2;
-    FrameTypeTimeSeriesMany = 3;
-    FrameTypeDirectoryListing = 4;
-    FrameTypeTable = 5;
-  }
-  // Type asserts that the frame matches a known type structure
-  FrameType type = 1 ;
-
-  message Notice {
-    enum NoticeSeverity {
-      // NoticeSeverityInfo is informational severity.
-      NoticeSeverityInfo = 0;
-      // NoticeSeverityWarning is warning severity.
-      NoticeSeverityWarning = 1;
-      // NoticeSeverityError is error severity.
-      NoticeSeverityError = 3;
-    }
-    // Severity is the severity level of the notice: info, warning, or error.
-    NoticeSeverity Severity = 1;
-
-    // Text is freeform descriptive text for the notice.
-    string text = 2;
-
-    // Link is an optional link for display in the user interface and can be an
-    // absolute URL or a path relative to Grafana's root url.
-    string link = 3;
-
-    enum InspectType {
-      // InspectTypeNone is no suggestion for a tab of the panel editor in Grafana's user interface.
-      InspectTypeNone = 0;
-
-      // InspectTypeMeta suggests the "meta" tab of the panel editor in Grafana's user interface.
-      InspectTypeMeta = 1;
-
-      // InspectTypeError suggests the "error" tab of the panel editor in Grafana's user interface.
-      InspectTypeError = 2;
-
-      // InspectTypeData suggests the "data" tab of the panel editor in Grafana's user interface.
-      InspectTypeData = 3;
-
-      // InspectTypeStats suggests the "stats" tab of the panel editor in Grafana's user interface.
-      InspectTypeStats = 4;
-    }
-    // Inspect is an optional suggestion for which tab to display in the panel inspector
-    // in Grafana's User interface. Can be meta, error, data, or stats.
-    InspectType inspect = 4;
-  }
-  // Notices provide additional information about the data in the Frame that
-  // Grafana can display to the user in the user interface.
-  repeated Notice  Notices = 6;
-
-  // VisType is used to indicate how the data should be visualized in explore.
-  enum VisType {
-    // VisTypeGraph indicates the response should be visualized using a graph.
-    VisTypeGraph = 0;
-
-    // VisTypeTable indicates the response should be visualized using a table.
-    VisTypeTable = 1;
-
-    // VisTypeLogs indicates the response should be visualized using a logs visualization.
-    VisTypeLogs = 2;
-
-    // VisTypeTrace indicates the response should be visualized using a trace view visualization.
-    VisTypeTrace = 3;
-
-    // VisTypeNodeGraph indicates the response should be visualized using a node graph visualization.
-    VisTypeNodeGraph = 4;
-  }
-
-  // PreferredVisualization is currently used to show results in Explore only in preferred visualisation option.
-  VisType PreferredVisualization = 8;
-
-  // ExecutedQueryString is the raw query sent to the underlying system. All macros and templating
-  // have been applied.  When metadata contains this value, it will be shown in the query inspector.
-  string executedQueryString = 9;
-}
-
-enum TimeOrdering {
-  ASCENDING = 0;
-  DESCENDING = 1;
-}
-
-message ListDimensionKeysRequest {
-  string filter = 1;
-  repeated Dimension selected_dimensions = 2;
-}
-
-message ListDimensionKeysResponse {
-  message Result {
-    string key = 1;
-    string description = 2;
-  }
-  repeated Result results = 1;
-}
-
-message ListDimensionValuesRequest {
-  string dimension_key = 1;
-  string filter = 2;
-  repeated Dimension selected_dimensions = 3;
-}
-
-message ListDimensionValuesResponse {
-  message Result {
-    string value = 1;
-    string description = 2;
-  }
-  repeated Result results = 1;
-}
-
-message TimeRange {
-  int64 fromEpochMS = 1;
-  int64 toEpochMS = 2;
-}
-
-message Dimension {
-  string key = 1;
-  string value = 2;
-}
-
-message QueryRequest {
-  string refId = 1;
-  int64 maxDataPoints = 2;
-  int64 intervalMS = 3;
-  TimeRange timeRange = 4;
-  // The offset for the result set
-  int64 startKey = 5;
-  repeated Dimension dimensions = 6;
-}
-
-// The response message containing the greetings
-message QueryResponse {
-  string refId = 1;
-  int64 nextKey = 2;
-  message Value {
-    int64 timestamp = 1;
-    float value = 2;
-  }
-  repeated Value values = 3;
-}
diff --git a/tangostationcontrol/proto/observation.proto b/tangostationcontrol/proto/observation.proto
deleted file mode 100644
index 3a08fe61c83d546fcda1012a641227ff7246e00d..0000000000000000000000000000000000000000
--- a/tangostationcontrol/proto/observation.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-service Observation {
-  rpc StartObservation(StartObservationRequest) returns (ObservationReply){}
-  rpc StopObservation(StopObservationRequest) returns (ObservationReply) {}
-}
-
-message StartObservationRequest {
-  string configuration = 1;
-}
-message StopObservationRequest {
-  int64 observation_id = 1;
-}
-
-message ObservationReply {
-  bool success = 1;
-  string exception = 2;
-}
diff --git a/tangostationcontrol/proto/statistics.proto b/tangostationcontrol/proto/statistics.proto
deleted file mode 100644
index 67d55f30ee17d7a5342765635a324ac425e84144..0000000000000000000000000000000000000000
--- a/tangostationcontrol/proto/statistics.proto
+++ /dev/null
@@ -1,101 +0,0 @@
-syntax = "proto3";
-
-import "google/protobuf/timestamp.proto";
-
-service Statistics {
-  rpc Bst(BstRequest) returns (BstReply) {}
-  rpc Sst(SstRequest) returns (SstReply) {}
-  rpc Xst(XstRequest) returns (XstReply) {}
-}
-
-message FrequencyBand {
-  string antenna_type = 1;
-  int32 clock = 2;
-  int32 nyquist_zone = 3;
-}
-
-message BstRequest {
-  string antenna_field = 1;
-  optional uint32 maxage = 2;
-}
-
-message BstResult {
-  google.protobuf.Timestamp timestamp = 1;
-  FrequencyBand frequency_band = 2;
-  float integration_interval = 3;
-
-  message BstBeamlet {
-    int32 beamlet = 1;
-    float x_power_db = 2;
-    float y_power_db = 3;
-  }
-
-  repeated BstBeamlet beamlets = 4;
-}
-
-message BstReply {
-  BstResult result = 3;
-}
-
-
-message SstRequest {
-  string antenna_field = 1;
-  optional uint32 maxage = 2;
-}
-
-message SstResult {
-  google.protobuf.Timestamp timestamp = 1;
-  FrequencyBand frequency_band = 2;
-  float integration_interval = 3;
-
-  message SstSubband {
-    int32 subband = 1;
-
-    message SstAntenna {
-      int32 antenna = 1;
-      float x_power_db = 2;
-      float y_power_db = 3;
-    }
-
-    repeated SstAntenna antennas = 2;
-  }
-
-  repeated SstSubband subbands = 4;
-}
-
-message SstReply {
-  SstResult result = 3;
-}
-
-message XstRequest {
-  string antenna_field = 1;
-  optional uint32 maxage = 2;
-}
-
-message XstResult {
-  google.protobuf.Timestamp timestamp = 1;
-  FrequencyBand frequency_band = 2;
-  float integration_interval = 3;
-  int32 subband = 4;
-
-  message XstBaseline {
-    int32 antenna1 = 1;
-    int32 antenna2 = 2;
-
-    message XstValue {
-      float power_db = 1;
-      float phase = 2;
-    }
-
-    XstValue xx = 3;
-    XstValue xy = 4;
-    XstValue yx = 5;
-    XstValue yy = 6;
-  }
-
-  repeated XstBaseline baselines = 5;
-}
-
-message XstReply {
-  XstResult result = 3;
-}
diff --git a/tangostationcontrol/pyproject.toml b/tangostationcontrol/pyproject.toml
deleted file mode 100644
index a4cd4e9bce1b099e4ea70708d4c16f11bf141c56..0000000000000000000000000000000000000000
--- a/tangostationcontrol/pyproject.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[build-system]
-requires = ['setuptools>=62.6', 'wheel']
-build-backend = 'setuptools.build_meta'
-[tool.pytest.ini_options]
-markers = [
-    "timeout",
-]
diff --git a/tangostationcontrol/tangostationcontrol/rpc/__init__.py b/tangostationcontrol/rpc/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/rpc/__init__.py
rename to tangostationcontrol/rpc/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/rpc/antennafield.py b/tangostationcontrol/rpc/antennafield.py
similarity index 97%
rename from tangostationcontrol/tangostationcontrol/rpc/antennafield.py
rename to tangostationcontrol/rpc/antennafield.py
index b90731ae88e32b99d87aff32a721ce9e2132bc89..a5a88e7dbba100afee30e12566c7446b2d6dd62a 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/antennafield.py
+++ b/tangostationcontrol/rpc/antennafield.py
@@ -6,9 +6,9 @@ import tango
 from tango import DeviceProxy
 
 from tangostationcontrol.common.antennas import antenna_field_family_name
-from tangostationcontrol.rpc._proto import antennafield_pb2_grpc
+from lofar_sid.interface.stationcontrol import antennafield_pb2_grpc
 
-from tangostationcontrol.rpc._proto.antennafield_pb2 import (
+from lofar_sid.interface.stationcontrol.antennafield_pb2 import (
     AntennaReply,
     AntennaResult,
     GetAntennaRequest,
diff --git a/tangostationcontrol/tangostationcontrol/rpc/common.py b/tangostationcontrol/rpc/common.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/rpc/common.py
rename to tangostationcontrol/rpc/common.py
diff --git a/tangostationcontrol/tangostationcontrol/rpc/grafana_api.py b/tangostationcontrol/rpc/grafana_api.py
similarity index 98%
rename from tangostationcontrol/tangostationcontrol/rpc/grafana_api.py
rename to tangostationcontrol/rpc/grafana_api.py
index b3e66eec6ca6e5eeaaa82b45aca9cc7127e16f58..8955c28c0f2a5ce1215f75283661083cee543bb8 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/grafana_api.py
+++ b/tangostationcontrol/rpc/grafana_api.py
@@ -9,9 +9,9 @@ import math
 from typing import Callable
 
 from tangostationcontrol.common.frequency_bands import Band, bands
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2_grpc
-from tangostationcontrol.rpc._proto import statistics_pb2
+from lofar_sid.interface.opah import grafana_apiv3_pb2
+from lofar_sid.interface.opah import grafana_apiv3_pb2_grpc
+from lofar_sid.interface.stationcontrol import statistics_pb2
 from tangostationcontrol.rpc.statistics import (
     Statistics,
     TooOldError,
diff --git a/tangostationcontrol/tangostationcontrol/rpc/messagehandler.py b/tangostationcontrol/rpc/messagehandler.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/rpc/messagehandler.py
rename to tangostationcontrol/rpc/messagehandler.py
index 08a9314d3a3244a1b11bda1a14d19d3ee49a8cf9..475c39557832c17c7690fbe500854fa335ce8db5 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/messagehandler.py
+++ b/tangostationcontrol/rpc/messagehandler.py
@@ -150,7 +150,7 @@ class MultiEndpointZMQMessageHandler:
 
                     try:
                         self.handle_message(topic, timestamp, message)
-                    except Exception as ex:
+                    except Exception:
                         logger.exception(
                             f"Exception handling message {topic=} {timestamp=}) {message=}"
                         )
diff --git a/tangostationcontrol/tangostationcontrol/rpc/observation.py b/tangostationcontrol/rpc/observation.py
similarity index 91%
rename from tangostationcontrol/tangostationcontrol/rpc/observation.py
rename to tangostationcontrol/rpc/observation.py
index 967a58d8b6b6484b7331ddc83f5eee2927e0f6fd..62d049574f1bd8985bb150b49d375c6625701dd1 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/observation.py
+++ b/tangostationcontrol/rpc/observation.py
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
-from tangostationcontrol.rpc._proto import observation_pb2
-from tangostationcontrol.rpc._proto import observation_pb2_grpc
+from lofar_sid.interface.stationcontrol import observation_pb2
+from lofar_sid.interface.stationcontrol import observation_pb2_grpc
 from tangostationcontrol.rpc.common import (
     call_exception_metrics,
     reply_on_exception,
diff --git a/tangostationcontrol/tangostationcontrol/rpc/server.py b/tangostationcontrol/rpc/server.py
similarity index 89%
rename from tangostationcontrol/tangostationcontrol/rpc/server.py
rename to tangostationcontrol/rpc/server.py
index 4130b21e55f365b0369458c12c78dc3b7fb19d1b..ab25553e6ab0a8fe2923d050621ad1e2eff7f6c7 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/server.py
+++ b/tangostationcontrol/rpc/server.py
@@ -8,19 +8,19 @@ import sys
 
 import grpc
 from grpc_reflection.v1alpha import reflection
-from tangostationcontrol.rpc._proto import observation_pb2
-from tangostationcontrol.rpc._proto import observation_pb2_grpc
-from tangostationcontrol.rpc._proto import statistics_pb2
-from tangostationcontrol.rpc._proto import statistics_pb2_grpc
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2_grpc
+from lofar_sid.interface.stationcontrol import observation_pb2
+from lofar_sid.interface.stationcontrol import observation_pb2_grpc
+from lofar_sid.interface.stationcontrol import statistics_pb2
+from lofar_sid.interface.stationcontrol import statistics_pb2_grpc
+from lofar_sid.interface.opah import grafana_apiv3_pb2
+from lofar_sid.interface.opah import grafana_apiv3_pb2_grpc
 from tangostationcontrol.rpc.observation import Observation
 from tangostationcontrol.rpc.statistics import Statistics
 from tangostationcontrol.rpc.grafana_api import GrafanaAPIV3
 from tangostationcontrol.rpc.messagehandler import MultiEndpointZMQMessageHandler
 from tangostationcontrol.common.lofar_logging import configure_logger
 from tangostationcontrol.metrics import start_metrics_server
-from tangostationcontrol.rpc._proto import antennafield_pb2, antennafield_pb2_grpc
+from lofar_sid.interface.stationcontrol import antennafield_pb2, antennafield_pb2_grpc
 from tangostationcontrol.rpc.antennafield import AntennaField
 
 logger = logging.getLogger()
@@ -32,7 +32,7 @@ class Server:
         self.statistics_servicer = Statistics()
 
         # Initialise gRPC server
-        logger.info(f"Initialising grpc server")
+        logger.info("Initialising grpc server")
         self.server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
         observation_pb2_grpc.add_ObservationServicer_to_server(
             Observation(), self.server
diff --git a/tangostationcontrol/tangostationcontrol/rpc/statistics.py b/tangostationcontrol/rpc/statistics.py
similarity index 97%
rename from tangostationcontrol/tangostationcontrol/rpc/statistics.py
rename to tangostationcontrol/rpc/statistics.py
index a5e51652a74776d99efeecadd6d1eed6ca7b5bad..13f66f67daf0013471d0f667390f413176434f1d 100644
--- a/tangostationcontrol/tangostationcontrol/rpc/statistics.py
+++ b/tangostationcontrol/rpc/statistics.py
@@ -9,8 +9,8 @@ import logging
 import numpy
 
 from tangostationcontrol.common.constants import N_pol, N_subbands
-from tangostationcontrol.rpc._proto import statistics_pb2
-from tangostationcontrol.rpc._proto import statistics_pb2_grpc
+from lofar_sid.interface.stationcontrol import statistics_pb2
+from lofar_sid.interface.stationcontrol import statistics_pb2_grpc
 from tangostationcontrol.rpc.common import (
     call_exception_metrics,
 )
@@ -53,7 +53,7 @@ class LastStatisticsMessagesMixin:
 
         try:
             return self.last_messages[(type_, antenna_field)]
-        except KeyError as e:
+        except KeyError:
             raise NotAvailableError(
                 f"Statistics not available of type {type_} for antenna field '{antenna_field}'"
             )
diff --git a/tangostationcontrol/tangostationcontrol/states/__init__.py b/tangostationcontrol/states/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/__init__.py
rename to tangostationcontrol/states/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/states/hibernate.py b/tangostationcontrol/states/hibernate.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/hibernate.py
rename to tangostationcontrol/states/hibernate.py
diff --git a/tangostationcontrol/tangostationcontrol/states/off.py b/tangostationcontrol/states/off.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/off.py
rename to tangostationcontrol/states/off.py
diff --git a/tangostationcontrol/tangostationcontrol/states/on.py b/tangostationcontrol/states/on.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/on.py
rename to tangostationcontrol/states/on.py
diff --git a/tangostationcontrol/tangostationcontrol/states/standby.py b/tangostationcontrol/states/standby.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/standby.py
rename to tangostationcontrol/states/standby.py
diff --git a/tangostationcontrol/tangostationcontrol/states/station_state.py b/tangostationcontrol/states/station_state.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/station_state.py
rename to tangostationcontrol/states/station_state.py
diff --git a/tangostationcontrol/tangostationcontrol/states/station_state_enum.py b/tangostationcontrol/states/station_state_enum.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/states/station_state_enum.py
rename to tangostationcontrol/states/station_state_enum.py
diff --git a/tangostationcontrol/tangostationcontrol/test/README.md b/tangostationcontrol/tangostationcontrol/test/README.md
deleted file mode 100644
index 4fdf3d298f0829f2cdb3bb8ca6cab2a343775479..0000000000000000000000000000000000000000
--- a/tangostationcontrol/tangostationcontrol/test/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test files included in Station Control
-
-Test code shared across unit and integration tests is placed here so it is
-accessible by both.
diff --git a/tangostationcontrol/test/README.md b/tangostationcontrol/test/README.md
index 56b174d88e533f075a6db0710924a3f46c7ebdb5..4fdf3d298f0829f2cdb3bb8ca6cab2a343775479 100644
--- a/tangostationcontrol/test/README.md
+++ b/tangostationcontrol/test/README.md
@@ -1,171 +1,4 @@
-# Unit Testing
+# Test files included in Station Control
 
-Is the procedure of testing individual units of code for fit for use. Often
-this entails isolating specific segments and testing the behavior given a
-certain range of different inputs. Arguably, the most effective forms of unit
-testing  deliberately uses _edge cases_ and makes assumptions about any other
-sections of code that are not currently under test.
-
-First the underlying technologies as well as how they are applied in Tango
-Station Control are discussed. If this seems uninteresting, or you are already
-familiar with these concepts you can skip to
-[Running tox tasks](#running tox tasks) and
-[Debugging unit tests](#debugging-unit-tests).
-
-### Table of Contents:
-
-- [Tox](#tox)
-- [Testing approach](#testing-approach)
-- [Mocking](#mocking)
-- [Running tox tasks](#running-tox-tasks)
-- [Debugging unit tests](#debugging-unit-tests)
-
-## Tox
-
-[Tox](https://tox.readthedocs.io/en/latest/) is a commandline tool to simplify
-running Python tasks such as linting and unit testing. Using a simple
-[configuration file](../tox.ini) it can setup a
-[virtual environment](https://virtualenv.pypa.io/en/latest/) that automatically
-installs dependencies before executing the task. These environments persist
-after the task finishes preventing the excessive downloading and installation
-of dependencies.
-
-The Tox environments in this project are configured to install any dependencies
-listed in [test-requirements.txt](../test-requirements.txt),
-this can also  easily be verified within our [configuration file](../tox.ini).
-
-## Testing approach
-
-For testing [stestr](https://stestr.readthedocs.io/en/latest/) is used this
-tool  has main advantage the utilization of a highly parallelized unit test
-runner that automatically scales to the number of simultaneous threads
-supported by the host processor. Other features include automatic test
-discovery and pattern matching to only execute a subset of tests.
-
-However, stestr is incompatible with using breakpoints
-(through [pdb](https://docs.python.org/3/library/pdb.html)) directly and  will
-simply fail the test upon encountering one. The
-[debugging unit tests](#debugging-unit-tests) section describes how to mitigate
-this and still debug individual unit tests effectively.
-
-All tests can be found in this test folder and all tests must inherit from
-`TestCase`, found in [base.py](base.py). This ensures that any test fixtures run
-before and after tests. These test fixtures allow to restore any global modified
-state, such as those of static variables. It is the task of the developer
-writing the unit test to ensure that any global modification is restored.
-
-When writing unit tests it is best practice to mimic the directory structure of
-the original project inside the test directory. Similarly, copying the filenames
-and adding _test__ to the beginning. Below is an example:
-
-* root
-  * database
-    * database_manager.py
-  * test
-    * base.py
-    * database
-        * test_database_manager.py
-
-## Mocking
-
-Contrary to many other programming languages, it is entirely possible to
-modify **any** function, object, file, import at runtime. This allows for a
-great deal of flexibility but also simplicity in the case of unit tests.
-
-Isolating functions is as simple as mocking any of the classes or functions it
-uses and modifying its return values such as specific behavior can be tested.
-Below is a simple demonstration mocking the return value of a function using the
-mock decorator. For more detailed explanations see
-[the official documentation](https://docs.python.org/3/library/unittest.mock.html).
-
-```python
-from unittest import mock
-
-# We pretend that `our_custom_module` contains a function `special_char`
-import our_custom_module
-
-def function_under_test(self):
-    if our_custom_module.special_char():
-        return 12
-    else:
-        return 0
-
-@mock.patch.object(our_custom_module, "special_char")
-def test_function_under_test(self, m_special_char):
-    """ Test functionality of `function_under_test`
-
-    This mock decorator _temporarily_ overwrites the :py:func:`special_char`
-    function within :py:module:`our_custom_module`. We get access to this
-    mocked object as function argument. Concurrent dependencies of these mock
-    statements are automatically solved by stestr.
-    """
-
-    # Mock the return value of the mocked object to be None
-    m_special_char.return_value = None
-
-    # Assert that function_under_test returns 0 when special_char returns None.
-    self.assertEqual(0, function_under_test())
-
-```
-
-## Running tox tasks
-
-Running tasks defined in Tox might be a little different than what you are used
-to. This is due to the Tango devices running from Docker containers. Typically,
-the dependencies are only available inside Docker and not on the host.
-
-The tasks can thus only be accessed by executing Tox from within a Tango device
-Docker container. A simple interactive Docker exec is enough to access them:
-
-```sh
-docker exec -it device-sdp /bin/bash
-cd /opt/lofar/tango/devices/
-tox
-```
-
-For specific tasks the `-e` parameter can be used, in addition, any arguments
-can be appended after the tasks. These arguments can be interpreted within the
-Tox  configuration file as `{posargs}`. Below are a few examples:
-
-```sh
-# Execute unit tests with Python 3.10 and only execute the test_get_version test
-# from the TestLofarGit class found within util/test_lofar.py
-# Noteworthy, this will also execute test_get_version_tag_dirty due to pattern
-# matching.
-tox -e py310 util.test_lofar.TestLofarGit.test_get_version_tag
-# Execute linting
-tox -e pep8
-```
-
-## Debugging unit tests
-
-Debugging works by utilizing the
-[virtual environment](https://virtualenv.pypa.io/en/latest/)that Tox creates.
-These are placed in the .tox/ directory. Each of these environments carries
-the same name as found in _tox.ini_, these match the names used for `-e`
-arguments
-
-Debugging unit tests is done by inserting the following code segment just before
-where you think issues occur:
-
-```python
-import pdb; pdb.set_trace()
-```
-
-Now as said stestr will catch any breakpoints and reraise them so we need to
-avoid using stestr while debugging. Simply source the virtual environment
-created by tox `source .tox/py37/bin/activate`. You should now see that the
-shell $PS1 prompt is modified to indicate the environment is active.
-
-From here execute `python -m testtools.run` and optionally the specific test
-case as command line argument. These test will not run in parallel but support
-all other features such as autodiscovery, test fixtures and mocking.
-
-Any breakpoint will be triggered and you can use the pdb interface
-(very similar to gdb) to step through the code, modify and print variables.
-
-Afterwards simply execute `deactivate` to deactivate the virtual environment.
-**DO NOT FORGOT TO REMOVE YOUR `pdb.set_trace()` STATEMENTS AFTERWARDS**
-
-The best approach to prevent committing `import pdb; pdb.set_trace()` is to
-ensure that all unit tests succeed beforehand.
+Test code shared across unit and integration tests is placed here so it is
+accessible by both.
diff --git a/tangostationcontrol/test/__init__.py b/tangostationcontrol/test/__init__.py
index 68ddd5cdc3efaa38e853aef337c08beb99c50c4c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tangostationcontrol/test/__init__.py
+++ b/tangostationcontrol/test/__init__.py
@@ -1,2 +0,0 @@
-# Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
-# SPDX-License-Identifier: Apache-2.0
diff --git a/tangostationcontrol/tangostationcontrol/test/dummy_observation_settings.py b/tangostationcontrol/test/dummy_observation_settings.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/dummy_observation_settings.py
rename to tangostationcontrol/test/dummy_observation_settings.py
diff --git a/tangostationcontrol/test/observation/__init__.py b/tangostationcontrol/test/observation/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tangostationcontrol/test/protection/__init__.py b/tangostationcontrol/test/protection/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/__init__.py b/tangostationcontrol/toolkit/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/__init__.py
rename to tangostationcontrol/toolkit/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py b/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py
rename to tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py b/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py
similarity index 94%
rename from tangostationcontrol/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py
rename to tangostationcontrol/toolkit/generate_caltable_from_lofar1.py
index fa58d936821bccd2778698fd0a4fce723487250c..473b4e2bc2cea6562d0ec73df69b0f2b273166f9 100755
--- a/tangostationcontrol/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py
+++ b/tangostationcontrol/toolkit/generate_caltable_from_lofar1.py
@@ -81,12 +81,12 @@ class LOFAR2CalTables:
                 calvalues_y = lofar1_caltable_data[:, antenna_nr * 2 + 1]
 
                 # validate
-                assert (
-                    len(calvalues_x) == 512
-                ), "Expected calibration values for 512 subbands"
-                assert (
-                    len(calvalues_y) == 512
-                ), "Expected calibration values for 512 subbands"
+                assert len(calvalues_x) == 512, (
+                    "Expected calibration values for 512 subbands"
+                )
+                assert len(calvalues_y) == 512, (
+                    "Expected calibration values for 512 subbands"
+                )
 
                 # write to LOFAR2
                 table.antennas[f"{antenna_name_prefix}{antenna_nr:02}"] = (
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/generate_cdb_from_lofar1.py b/tangostationcontrol/toolkit/generate_cdb_from_lofar1.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/generate_cdb_from_lofar1.py
rename to tangostationcontrol/toolkit/generate_cdb_from_lofar1.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/README.md b/tangostationcontrol/toolkit/lofar1/README.md
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/README.md
rename to tangostationcontrol/toolkit/lofar1/README.md
diff --git a/tangostationcontrol/tangostationcontrol/rpc/_proto/__init__.py b/tangostationcontrol/toolkit/lofar1/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/rpc/_proto/__init__.py
rename to tangostationcontrol/toolkit/lofar1/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/antenna_cables.py b/tangostationcontrol/toolkit/lofar1/antenna_cables.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/antenna_cables.py
rename to tangostationcontrol/toolkit/lofar1/antenna_cables.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py b/tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py
rename to tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py
index 74d60e6ba818f17c3219add352200198bcf04f07..b6a49cbad8bbcbbee91cb85513defb1547a3c5eb 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py
+++ b/tangostationcontrol/toolkit/lofar1/calibration_table_LOFAR1.py
@@ -90,7 +90,6 @@ class CalibrationTable:
         try:
             data = CalibrationTable._parse_data(data_raw)
         except Exception as e:
-
             logger.error("error reading file %s", file_path)
             logger.debug(data_raw)
             logger.exception(e)
@@ -191,7 +190,6 @@ class CalibrationTable:
             elif line == "HeaderStart":
                 continue
             elif fullmatch(CalibrationTable._HEADER_LINE_PATTERN, line):
-
                 key, value = line.split("=")
 
                 key = (
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/caltable.py b/tangostationcontrol/toolkit/lofar1/caltable.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/caltable.py
rename to tangostationcontrol/toolkit/lofar1/caltable.py
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/cobalt.py b/tangostationcontrol/toolkit/lofar1/cobalt.py
similarity index 93%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/cobalt.py
rename to tangostationcontrol/toolkit/lofar1/cobalt.py
index 4de8eb09bdcce60bc264056bb4b7048a39974e79..252e5bc86199ada605c1e032ec6d8282c9223b02 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/cobalt.py
+++ b/tangostationcontrol/toolkit/lofar1/cobalt.py
@@ -57,7 +57,7 @@ class OfflineResolver(Resolver, dict):
     @cache
     def download_raw() -> bytes:
         return urllib.request.urlopen(
-            f"https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/StaticMetaData/COBALT2_IP_MACs.txt"
+            "https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/StaticMetaData/COBALT2_IP_MACs.txt"
         ).readlines()
 
     def parse_raw(self):
@@ -100,7 +100,7 @@ class COBALTPhaseCenters(dict):
     @cache
     def download_raw() -> List[str]:
         return urllib.request.urlopen(
-            f"https://git.astron.nl/lofar2.0/cobalt/-/raw/main/GPUProc/etc/parset-additions.d/default/StationPositions.parset?ref_type=heads"
+            "https://git.astron.nl/lofar2.0/cobalt/-/raw/main/GPUProc/etc/parset-additions.d/default/StationPositions.parset?ref_type=heads"
         ).readlines()
 
     def parse_raw(self):
@@ -154,7 +154,7 @@ class COBALTStationStreams(dict):
     @cache
     def download_raw() -> List[str]:
         return urllib.request.urlopen(
-            f"https://git.astron.nl/lofar2.0/cobalt/-/raw/main/GPUProc/etc/parset-additions.d/default/StationStreams.parset?ref_type=heads"
+            "https://git.astron.nl/lofar2.0/cobalt/-/raw/main/GPUProc/etc/parset-additions.d/default/StationStreams.parset?ref_type=heads"
         ).readlines()
 
     def parse_raw(self):
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/etrs.py b/tangostationcontrol/toolkit/lofar1/etrs.py
similarity index 95%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/etrs.py
rename to tangostationcontrol/toolkit/lofar1/etrs.py
index 043940431651374bfdebc2828b267003bc1c2fac..6aa844658602004223f407d0ad33e8ee43e3e161 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/etrs.py
+++ b/tangostationcontrol/toolkit/lofar1/etrs.py
@@ -61,7 +61,7 @@ class PQRToETRS(dict):
     @cache
     def download_raw() -> List[str]:
         return urllib.request.urlopen(
-            f"https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat"
+            "https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat"
         ).readlines()
 
     def parse_raw(self):
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/hba_rotations.py b/tangostationcontrol/toolkit/lofar1/hba_rotations.py
similarity index 88%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/hba_rotations.py
rename to tangostationcontrol/toolkit/lofar1/hba_rotations.py
index ce22799db8fc8331bb7278662b46cae463d3b0e9..8af1e3b751e807e05e5f690b91c31a1a2c2b6bdc 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/hba_rotations.py
+++ b/tangostationcontrol/toolkit/lofar1/hba_rotations.py
@@ -28,7 +28,7 @@ class HBARotations(dict):
     @cache
     def download_raw() -> List[str]:
         return urllib.request.urlopen(
-            f"https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/Coordinates/data/hba-rotations.csv?ref_type=heads"
+            "https://git.astron.nl/ro/lofar/-/raw/master/MAC/Deployment/data/Coordinates/data/hba-rotations.csv?ref_type=heads"
         ).readlines()
 
     def parse_raw(self):
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
deleted file mode 100644
index 090286a2a5a32c2a804d3a619cd93ff2ee52274e..0000000000000000000000000000000000000000
--- a/tangostationcontrol/tox.ini
+++ /dev/null
@@ -1,127 +0,0 @@
-[tox]
-min_version = 4.3.3
-requires =
-    tox-ignore-env-name-mismatch ~= 0.2.0
-envlist = black,pep8,pylint,py3{10,11},docs
-
-[testenv]
-base_python=python3.10
-usedevelop = True
-package = wheel
-wheel_build_env = .pkg
-; Python and tox variables are used to access modules and binaries instead of
-; directly. This makes the setup robust for using sitepackages=True.
-;
-; Also provide pip index location for:
-;  - lofar-station-client
-setenv =
-    PYTHONWARNINGS=default::DeprecationWarning
-    PIP_EXTRA_INDEX_URL=https://git.astron.nl/api/v4/groups/36/-/packages/pypi/simple
-; Share the same envdir with as many jobs as possible due to extensive time it
-; takes to compile the pytango wheel, in addition to its large install size.
-; should the environment change (such as the Python version) the environment
-; will automatically be recreated.
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
-allowlist_externals =
-    {work_dir}/.tox/bin/python
-commands_pre =
-    {envpython} --version
-    {work_dir}/.tox/bin/python -m tox --version
-    {envpython} -m grpc_tools.protoc -Itangostationcontrol/rpc/_proto=proto --python_out=. --pyi_out=. --grpc_python_out=. proto/observation.proto
-    {envpython} -m grpc_tools.protoc -Itangostationcontrol/rpc/_proto=proto --python_out=. --pyi_out=. --grpc_python_out=. proto/antennafield.proto
-    {envpython} -m grpc_tools.protoc -Itangostationcontrol/rpc/_proto=proto --python_out=. --pyi_out=. --grpc_python_out=. proto/statistics.proto
-    {envpython} -m grpc_tools.protoc -Itangostationcontrol/rpc/_proto=proto --python_out=. --pyi_out=. --grpc_python_out=. proto/grafana-apiv3.proto
-commands =
-    {envpython} -m pytest --version
-    {envpython} -m pytest -v --log-level=DEBUG --forked test/{posargs}
-
-[testenv:integration]
-allowlist_externals =
-    {work_dir}/.tox/bin/python
-    echo
-passenv =
-    TANGO_HOST
-    DEBUG_HOST
-setenv =
-    VIRTUAL_ENV={envdir}
-    TESTS_DIR=./integration_test/{env:TEST_MODULE:default}
-    PIP_EXTRA_INDEX_URL=https://git.astron.nl/api/v4/groups/36/-/packages/pypi/simple
-commands =
-    echo "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE:default})"
-    {envpython} -m pytest --version
-    {envpython} -m coverage run -m pytest -v --log-level=DEBUG {env:TESTS_DIR}/{posargs}
-    {envpython} -m coverage html --omit='*test*' -d cover
-    {envpython} -m coverage xml -o coverage.xml
-    {envpython} -m coverage report --omit='*test*'
-
-[testenv:{cover,coverage}]
-base_python = python3.10
-runner = ignore_env_name_mismatch
-envdir = {toxworkdir}/coverage
-setenv =
-    VIRTUAL_ENV={envdir}
-    PIP_EXTRA_INDEX_URL=https://git.astron.nl/api/v4/groups/36/-/packages/pypi/simple
-commands =
-    {envpython} -m pytest --version
-    {envpython} -m coverage --version
-    {envpython} -m coverage erase
-    {envpython} -m coverage run -m pytest -v --forked test/{posargs}
-    {envpython} -m pytest -v --log-level=DEBUG --cov-report term --cov-report html --cov-append --cov-report xml:coverage.xml --cov=tangostationcontrol --forked test/{posargs}
-
-# Use generative name and command prefixes to reuse the same virtualenv
-# for all linting jobs.
-[testenv:{pep8,black,pylint,format}]
-base_python = python3.10
-runner = ignore_env_name_mismatch
-usedevelop = False
-envdir = {toxworkdir}/linting
-commands =
-    pep8: {envpython} -m doc8 --version
-    pep8: {envpython} -m flake8 --version
-    pep8: {envpython} -m doc8 docs/source/ --ignore D001
-    pep8: {envpython} -m flake8 tangostationcontrol integration_test test
-    black: {envpython} -m black --version
-    black: {envpython} -m black --check --diff tangostationcontrol integration_test test --extend-exclude=SNMP_mib_loading|output_pymibs
-    pylint: {envpython} -m pylint --version
-    pylint: {envpython} -m pylint --ignore=test,integration_test --max-line-length=88 tangostationcontrol
-    format: {envpython} -m autopep8 --version
-    format: {envpython} -m autopep8 -v -aa --in-place --recursive tangostationcontrol/
-    format: {envpython} -m autopep8 -v -aa --in-place --recursive integration_test/
-    format: {envpython} -m autopep8 -v -aa --in-place --recursive test/
-    format: {envpython} -m black -v tangostationcontrol integration_test test --extend-exclude=SNMP_mib_loading|output_pymibs
-
-[testenv:bandit];
-; B104: hardcoded_bind_all_interfaces
-;           - We disable this warning as Docker serves as our firewall.
-;             It thus matters what interfaces Docker will bind our
-;             containers to, not what our containers listen on.
-commands =
-    {envpython} -m bandit --version
-    {envpython} -m bandit -r devices/ -n5 -ll -s B104
-
-[testenv:xenon];
-commands =
-    {envpython} -m xenon --version
-    {envpython} -m xenon tangostationcontrol -b B -m A -a A2
-
-[testenv:build]
-base_python = python3.10
-usedevelop = False
-commands =
-    {envpython} -m build
-
-[testenv:docs]
-envdir = {toxworkdir}/docs
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/docs/docs-requirements.txt
-commands =
-    sphinx-build --version
-    sphinx-build -W -b html docs/source docs/build/html
-
-[flake8]
-filename = *.py,.stestr.conf,.txt
-ignore = B014, B019, B028, W291, W293, W391, E111, E114, E121, E122, E123, E124, E126, E127, E128, E131, E201, E201, E202, E203, E221, E222, E225, E226, E231, E241, E251, E252, E261, E262, E265, E271, E301, E302, E303, E305, E306, E401, E402, E501, E502, E701, E712, E721, E731, F403, F523, F541, F841, H301, H306, H401, H403, H404, H405, W503
-exclude = SNMP_mib_loading,output_pymibs,_proto
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..56b174d88e533f075a6db0710924a3f46c7ebdb5
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,171 @@
+# Unit Testing
+
+Is the procedure of testing individual units of code for fit for use. Often
+this entails isolating specific segments and testing the behavior given a
+certain range of different inputs. Arguably, the most effective forms of unit
+testing  deliberately uses _edge cases_ and makes assumptions about any other
+sections of code that are not currently under test.
+
+First the underlying technologies as well as how they are applied in Tango
+Station Control are discussed. If this seems uninteresting, or you are already
+familiar with these concepts you can skip to
+[Running tox tasks](#running tox tasks) and
+[Debugging unit tests](#debugging-unit-tests).
+
+### Table of Contents:
+
+- [Tox](#tox)
+- [Testing approach](#testing-approach)
+- [Mocking](#mocking)
+- [Running tox tasks](#running-tox-tasks)
+- [Debugging unit tests](#debugging-unit-tests)
+
+## Tox
+
+[Tox](https://tox.readthedocs.io/en/latest/) is a commandline tool to simplify
+running Python tasks such as linting and unit testing. Using a simple
+[configuration file](../tox.ini) it can setup a
+[virtual environment](https://virtualenv.pypa.io/en/latest/) that automatically
+installs dependencies before executing the task. These environments persist
+after the task finishes preventing the excessive downloading and installation
+of dependencies.
+
+The Tox environments in this project are configured to install any dependencies
+listed in [test-requirements.txt](../test-requirements.txt),
+this can also  easily be verified within our [configuration file](../tox.ini).
+
+## Testing approach
+
+For testing [stestr](https://stestr.readthedocs.io/en/latest/) is used this
+tool  has main advantage the utilization of a highly parallelized unit test
+runner that automatically scales to the number of simultaneous threads
+supported by the host processor. Other features include automatic test
+discovery and pattern matching to only execute a subset of tests.
+
+However, stestr is incompatible with using breakpoints
+(through [pdb](https://docs.python.org/3/library/pdb.html)) directly and  will
+simply fail the test upon encountering one. The
+[debugging unit tests](#debugging-unit-tests) section describes how to mitigate
+this and still debug individual unit tests effectively.
+
+All tests can be found in this test folder and all tests must inherit from
+`TestCase`, found in [base.py](base.py). This ensures that any test fixtures run
+before and after tests. These test fixtures allow to restore any global modified
+state, such as those of static variables. It is the task of the developer
+writing the unit test to ensure that any global modification is restored.
+
+When writing unit tests it is best practice to mimic the directory structure of
+the original project inside the test directory. Similarly, copying the filenames
+and adding _test__ to the beginning. Below is an example:
+
+* root
+  * database
+    * database_manager.py
+  * test
+    * base.py
+    * database
+        * test_database_manager.py
+
+## Mocking
+
+Contrary to many other programming languages, it is entirely possible to
+modify **any** function, object, file, import at runtime. This allows for a
+great deal of flexibility but also simplicity in the case of unit tests.
+
+Isolating functions is as simple as mocking any of the classes or functions it
+uses and modifying its return values such as specific behavior can be tested.
+Below is a simple demonstration mocking the return value of a function using the
+mock decorator. For more detailed explanations see
+[the official documentation](https://docs.python.org/3/library/unittest.mock.html).
+
+```python
+from unittest import mock
+
+# We pretend that `our_custom_module` contains a function `special_char`
+import our_custom_module
+
+def function_under_test(self):
+    if our_custom_module.special_char():
+        return 12
+    else:
+        return 0
+
+@mock.patch.object(our_custom_module, "special_char")
+def test_function_under_test(self, m_special_char):
+    """ Test functionality of `function_under_test`
+
+    This mock decorator _temporarily_ overwrites the :py:func:`special_char`
+    function within :py:module:`our_custom_module`. We get access to this
+    mocked object as function argument. Concurrent dependencies of these mock
+    statements are automatically solved by stestr.
+    """
+
+    # Mock the return value of the mocked object to be None
+    m_special_char.return_value = None
+
+    # Assert that function_under_test returns 0 when special_char returns None.
+    self.assertEqual(0, function_under_test())
+
+```
+
+## Running tox tasks
+
+Running tasks defined in Tox might be a little different than what you are used
+to. This is due to the Tango devices running from Docker containers. Typically,
+the dependencies are only available inside Docker and not on the host.
+
+The tasks can thus only be accessed by executing Tox from within a Tango device
+Docker container. A simple interactive Docker exec is enough to access them:
+
+```sh
+docker exec -it device-sdp /bin/bash
+cd /opt/lofar/tango/devices/
+tox
+```
+
+For specific tasks the `-e` parameter can be used, in addition, any arguments
+can be appended after the tasks. These arguments can be interpreted within the
+Tox  configuration file as `{posargs}`. Below are a few examples:
+
+```sh
+# Execute unit tests with Python 3.10 and only execute the test_get_version test
+# from the TestLofarGit class found within util/test_lofar.py
+# Noteworthy, this will also execute test_get_version_tag_dirty due to pattern
+# matching.
+tox -e py310 util.test_lofar.TestLofarGit.test_get_version_tag
+# Execute linting
+tox -e pep8
+```
+
+## Debugging unit tests
+
+Debugging works by utilizing the
+[virtual environment](https://virtualenv.pypa.io/en/latest/)that Tox creates.
+These are placed in the .tox/ directory. Each of these environments carries
+the same name as found in _tox.ini_, these match the names used for `-e`
+arguments
+
+Debugging unit tests is done by inserting the following code segment just before
+where you think issues occur:
+
+```python
+import pdb; pdb.set_trace()
+```
+
+Now as said stestr will catch any breakpoints and reraise them so we need to
+avoid using stestr while debugging. Simply source the virtual environment
+created by tox `source .tox/py37/bin/activate`. You should now see that the
+shell $PS1 prompt is modified to indicate the environment is active.
+
+From here execute `python -m testtools.run` and optionally the specific test
+case as command line argument. These test will not run in parallel but support
+all other features such as autodiscovery, test fixtures and mocking.
+
+Any breakpoint will be triggered and you can use the pdb interface
+(very similar to gdb) to step through the code, modify and print variables.
+
+Afterwards simply execute `deactivate` to deactivate the virtual environment.
+**DO NOT FORGOT TO REMOVE YOUR `pdb.set_trace()` STATEMENTS AFTERWARDS**
+
+The best approach to prevent committing `import pdb; pdb.set_trace()` is to
+ensure that all unit tests succeed beforehand.
diff --git a/tangostationcontrol/test/beam/__init__.py b/tests/__init__.py
similarity index 100%
rename from tangostationcontrol/test/beam/__init__.py
rename to tests/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/test/__init__.py b/tests/asyncio/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/__init__.py
rename to tests/asyncio/__init__.py
diff --git a/tangostationcontrol/test/asyncio/test_event_loop_thread.py b/tests/asyncio/test_event_loop_thread.py
similarity index 94%
rename from tangostationcontrol/test/asyncio/test_event_loop_thread.py
rename to tests/asyncio/test_event_loop_thread.py
index d5301f81eeebc35fe4525696a330911eb3aacc8c..46c894708b850e55fd7995b2dffc4580b2bb0aaf 100644
--- a/tangostationcontrol/test/asyncio/test_event_loop_thread.py
+++ b/tests/asyncio/test_event_loop_thread.py
@@ -7,8 +7,7 @@ from unittest.mock import MagicMock
 from tangostationcontrol.asyncio import (
     EventLoopThread,
 )
-
-from test import base
+from tests import base
 
 
 class TestEventLoopThread(base.TestCase):
@@ -25,7 +24,7 @@ class TestEventLoopThread(base.TestCase):
         callback = MagicMock()
 
         elt = EventLoopThread()
-        handle = elt.call_soon_threadsafe(callback)
+        elt.call_soon_threadsafe(callback)
         elt.stop()
 
         # check that the callback was indeed called
diff --git a/tangostationcontrol/test/asyncio/test_monitored_lock.py b/tests/asyncio/test_monitored_lock.py
similarity index 98%
rename from tangostationcontrol/test/asyncio/test_monitored_lock.py
rename to tests/asyncio/test_monitored_lock.py
index 269098032e269fe6fd3747527e1c5ab5509d6655..a70b7a7643793bdd48efdc654e5edfd968bc3d05 100644
--- a/tangostationcontrol/test/asyncio/test_monitored_lock.py
+++ b/tests/asyncio/test_monitored_lock.py
@@ -8,7 +8,7 @@ from tangostationcontrol.asyncio import (
     MonitoredLock,
 )
 
-from test import base
+from tests import base
 
 
 class TestMonitoredLock(base.TestCase):
diff --git a/tangostationcontrol/test/asyncio/test_periodic_task.py b/tests/asyncio/test_periodic_task.py
similarity index 97%
rename from tangostationcontrol/test/asyncio/test_periodic_task.py
rename to tests/asyncio/test_periodic_task.py
index 280561c6e1e48d110b0bc272989708cf1c44c5c0..60003e639139384566d0538862f8a3ce611fa179 100644
--- a/tangostationcontrol/test/asyncio/test_periodic_task.py
+++ b/tests/asyncio/test_periodic_task.py
@@ -6,7 +6,7 @@ from tangostationcontrol.asyncio import (
     PeriodicTask,
 )
 
-from test import base
+from tests import base
 
 
 class TestPeriodicTask(base.TestCase):
diff --git a/tangostationcontrol/test/base.py b/tests/base.py
similarity index 100%
rename from tangostationcontrol/test/base.py
rename to tests/base.py
diff --git a/tangostationcontrol/test/clients/__init__.py b/tests/beam/__init__.py
similarity index 100%
rename from tangostationcontrol/test/clients/__init__.py
rename to tests/beam/__init__.py
diff --git a/tangostationcontrol/test/beam/managers/__init__.py b/tests/beam/managers/__init__.py
similarity index 100%
rename from tangostationcontrol/test/beam/managers/__init__.py
rename to tests/beam/managers/__init__.py
diff --git a/tangostationcontrol/test/beam/managers/test_digitalbeam_manager.py b/tests/beam/managers/test_digitalbeam_manager.py
similarity index 99%
rename from tangostationcontrol/test/beam/managers/test_digitalbeam_manager.py
rename to tests/beam/managers/test_digitalbeam_manager.py
index 44c725d3858728b41df748ab71c566f526eda1cf..e58abeb7d044eebb49c08289e8b05271d742e605 100644
--- a/tangostationcontrol/test/beam/managers/test_digitalbeam_manager.py
+++ b/tests/beam/managers/test_digitalbeam_manager.py
@@ -14,7 +14,7 @@ from tangostationcontrol.common.constants import (
     N_pn,
     N_point_prop,
 )
-from test import base
+from tests import base
 
 
 class TestDigitalBeamManager(base.TestCase):
diff --git a/tangostationcontrol/test/beam/managers/test_tilebeam_manager.py b/tests/beam/managers/test_tilebeam_manager.py
similarity index 99%
rename from tangostationcontrol/test/beam/managers/test_tilebeam_manager.py
rename to tests/beam/managers/test_tilebeam_manager.py
index 34ab655f9a9a82c999503d5bf36ac2c3cdbce8c3..217092b4bc8376573ccf4abedcab7350b5541b2b 100644
--- a/tangostationcontrol/test/beam/managers/test_tilebeam_manager.py
+++ b/tests/beam/managers/test_tilebeam_manager.py
@@ -3,7 +3,7 @@
 
 import datetime
 from unittest.mock import MagicMock, patch, call
-from test import base
+from tests import base
 import numpy.testing
 
 from tangostationcontrol.beam.managers import TileBeamManager, _tilebeam
diff --git a/tangostationcontrol/test/beam/test_delays.py b/tests/beam/test_delays.py
similarity index 99%
rename from tangostationcontrol/test/beam/test_delays.py
rename to tests/beam/test_delays.py
index 69d61a371ea756873575146ecc0357329527658b..cfa29652813f29717ede9814f7a34f54ecadaf73 100644
--- a/tangostationcontrol/test/beam/test_delays.py
+++ b/tests/beam/test_delays.py
@@ -15,7 +15,7 @@ import threading
 from tangostationcontrol.beam.delays import Delays, is_valid_pointing
 from tangostationcontrol.common.constants import MAX_ANTENNA, N_beamlets_ctrl
 
-from test import base
+from tests import base
 
 
 class TestDelays(base.TestCase):
@@ -201,7 +201,7 @@ class TestDelaysBulk(base.TestCase):
         self.positions = numpy.array([[i, 2, 3] for i in range(MAX_ANTENNA)])
         self.directions = numpy.array(
             [
-                ["J2000", f"{i*numpy.pi/180}rad", f"{i*numpy.pi/180}rad"]
+                ["J2000", f"{i * numpy.pi / 180}rad", f"{i * numpy.pi / 180}rad"]
                 for i in range(N_beamlets_ctrl)
             ]
         )
diff --git a/tangostationcontrol/test/beam/test_geo.py b/tests/beam/test_geo.py
similarity index 99%
rename from tangostationcontrol/test/beam/test_geo.py
rename to tests/beam/test_geo.py
index c2d61d60609b91aa44b05cb8df04eeec49cda351..5c64bceea18f604e5de3d4fd98d011e909f449b1 100644
--- a/tangostationcontrol/test/beam/test_geo.py
+++ b/tests/beam/test_geo.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from test import base
+from tests import base
 import numpy.testing
 
 from tangostationcontrol.beam.geo import ETRS_to_ITRF, ETRS_to_GEO, GEO_to_GEOHASH
diff --git a/tangostationcontrol/test/beam/test_hba_tile.py b/tests/beam/test_hba_tile.py
similarity index 98%
rename from tangostationcontrol/test/beam/test_hba_tile.py
rename to tests/beam/test_hba_tile.py
index 19ef26793dc8f84f4ae9957d564e8da709eb3751..a04c2109f3c326365bfaf53765fc3348c4fcd330 100644
--- a/tangostationcontrol/test/beam/test_hba_tile.py
+++ b/tests/beam/test_hba_tile.py
@@ -7,7 +7,7 @@ import numpy.testing
 
 from tangostationcontrol.beam.hba_tile import HBATAntennaOffsets
 
-from test import base
+from tests import base
 
 
 class TestHBATAntennaOffsets(base.TestCase):
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/lofar1/__init__.py b/tests/change-events/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/toolkit/lofar1/__init__.py
rename to tests/change-events/__init__.py
diff --git a/tangostationcontrol/test/change-events/test_sync_sync.py b/tests/change-events/test_sync_sync.py
similarity index 100%
rename from tangostationcontrol/test/change-events/test_sync_sync.py
rename to tests/change-events/test_sync_sync.py
diff --git a/tangostationcontrol/test/common/__init__.py b/tests/clients/__init__.py
similarity index 100%
rename from tangostationcontrol/test/common/__init__.py
rename to tests/clients/__init__.py
diff --git a/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-CONF.mib b/tests/clients/snmp_mib_loading/SNMPv2-CONF.mib
similarity index 100%
rename from tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-CONF.mib
rename to tests/clients/snmp_mib_loading/SNMPv2-CONF.mib
diff --git a/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-SMI.mib b/tests/clients/snmp_mib_loading/SNMPv2-SMI.mib
similarity index 100%
rename from tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-SMI.mib
rename to tests/clients/snmp_mib_loading/SNMPv2-SMI.mib
diff --git a/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-TC.mib b/tests/clients/snmp_mib_loading/SNMPv2-TC.mib
similarity index 100%
rename from tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-TC.mib
rename to tests/clients/snmp_mib_loading/SNMPv2-TC.mib
diff --git a/tangostationcontrol/test/clients/snmp_mib_loading/TEST-MIB.mib b/tests/clients/snmp_mib_loading/TEST-MIB.mib
similarity index 100%
rename from tangostationcontrol/test/clients/snmp_mib_loading/TEST-MIB.mib
rename to tests/clients/snmp_mib_loading/TEST-MIB.mib
diff --git a/tangostationcontrol/test/clients/test_client.py b/tests/clients/test_client.py
similarity index 99%
rename from tangostationcontrol/test/clients/test_client.py
rename to tests/clients/test_client.py
index 1b31de2c47c7ec2255d98cbaa8e3c40e82af47ee..0d40ee9ed98069b494ac2e06f774a603015187a8 100644
--- a/tangostationcontrol/test/clients/test_client.py
+++ b/tests/clients/test_client.py
@@ -88,7 +88,7 @@ class TestClient(CommClient):
         if annotation.endswith("_RW"):
             annotation = annotation[:-1]
 
-        if dtype == str and dims == (1,):
+        if dtype is str and dims == (1,):
             self.values[annotation] = ""
         elif dims == (1,):
             self.values[annotation] = dtype(0)
diff --git a/tangostationcontrol/test/clients/test_opcua_client.py b/tests/clients/test_opcua_client.py
similarity index 98%
rename from tangostationcontrol/test/clients/test_opcua_client.py
rename to tests/clients/test_opcua_client.py
index 4998963c7a48f04628878d68832dd3b870680e67..e1044b4c97238b6f28f912ed6fdb3e98913abe06 100644
--- a/tangostationcontrol/test/clients/test_opcua_client.py
+++ b/tests/clients/test_opcua_client.py
@@ -18,7 +18,7 @@ from tangostationcontrol.clients.opcua_client import (
     OPCUAConnectionStatus,
 )
 
-from test.opcua import make_opcua_server
+from tests.opcua import make_opcua_server
 
 
 class AttrProps:
@@ -292,10 +292,10 @@ class TestOPCua(unittest.IsolatedAsyncioTestCase):
                     f"type error. Got: {test.ua_type} expected: {ua_type}",
                 )
                 self.assertTrue(
-                    hasattr(test, "write_function"), f"No write function found"
+                    hasattr(test, "write_function"), "No write function found"
                 )
                 self.assertTrue(
-                    hasattr(test, "read_function"), f"No read function found"
+                    hasattr(test, "read_function"), "No read function found"
                 )
 
     def _get_test_value(self, dims, n_type):
@@ -385,7 +385,7 @@ class TestOPCua(unittest.IsolatedAsyncioTestCase):
             # derive a default value that can get lost in a type translation
             if numpy_type is str:
                 default_value = "foo"
-            elif numpy_type == bool:
+            elif numpy_type is bool:
                 default_value = True
             else:
                 # integer or float type
@@ -436,7 +436,7 @@ class TestOPCua(unittest.IsolatedAsyncioTestCase):
         async def compare_values(val, j, i):
             """comparison function that replaces `set_data_value` inside the attributes write function"""
             # test valuest
-            val = val.tolist() if type(val) == numpy.ndarray else val
+            val = val.tolist() if type(val) is numpy.ndarray else val
             if j != DIMENSION_TESTS[0]:
                 comp = (
                     val.Value
diff --git a/tangostationcontrol/test/clients/test_snmp_client.py b/tests/clients/test_snmp_client.py
similarity index 99%
rename from tangostationcontrol/test/clients/test_snmp_client.py
rename to tests/clients/test_snmp_client.py
index 727c810a260e3b0f5452f56966ffa8314dc88b06..da9ccde8096f9bd81a697ca12e0778ee9f9cc600 100644
--- a/tangostationcontrol/test/clients/test_snmp_client.py
+++ b/tests/clients/test_snmp_client.py
@@ -3,7 +3,7 @@
 
 from os import path
 from unittest import mock
-from test import base
+from tests import base
 
 import numpy
 import pysnmp.hlapi.v3arch.asyncio as hlapi
diff --git a/tangostationcontrol/test/configuration/__init__.py b/tests/common/__init__.py
similarity index 100%
rename from tangostationcontrol/test/configuration/__init__.py
rename to tests/common/__init__.py
diff --git a/tangostationcontrol/test/asyncio/__init__.py b/tests/common/events/__init__.py
similarity index 100%
rename from tangostationcontrol/test/asyncio/__init__.py
rename to tests/common/events/__init__.py
diff --git a/tangostationcontrol/test/common/events/mixin.py b/tests/common/events/mixin.py
similarity index 100%
rename from tangostationcontrol/test/common/events/mixin.py
rename to tests/common/events/mixin.py
diff --git a/tangostationcontrol/test/common/events/test_change_events.py b/tests/common/events/test_change_events.py
similarity index 98%
rename from tangostationcontrol/test/common/events/test_change_events.py
rename to tests/common/events/test_change_events.py
index 4d2c24f7ac8b1a79e04ede30d06de5a5c1ae2d19..c2a8c91c18dabd5ef7b434b7aa8f0f0546cf0271 100644
--- a/tangostationcontrol/test/common/events/test_change_events.py
+++ b/tests/common/events/test_change_events.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from test.common.events.mixin import EventSubscriptionMixin
+from tests.common.events.mixin import EventSubscriptionMixin
 from tangostationcontrol.common.events import (
     ChangeEvents,
 )
@@ -10,7 +10,7 @@ from tango.server import Device, attribute, AttrWriteType, command
 from tango.test_context import DeviceTestContext
 from tango import DevFailed
 
-from test import base
+from tests import base
 
 
 class TestChangeEvents(EventSubscriptionMixin, base.TestCase):
diff --git a/tangostationcontrol/test/common/events/test_register_subscriptions.py b/tests/common/events/test_register_subscriptions.py
similarity index 99%
rename from tangostationcontrol/test/common/events/test_register_subscriptions.py
rename to tests/common/events/test_register_subscriptions.py
index 20aee763cb02d5de057018fb135e8a43b27bce93..430506b43b7916fa74d8d97fa02edf1e49404f1e 100644
--- a/tangostationcontrol/test/common/events/test_register_subscriptions.py
+++ b/tests/common/events/test_register_subscriptions.py
@@ -13,13 +13,12 @@ from tangostationcontrol.common.constants import DEFAULT_POLLING_PERIOD_METADATA
 from tangostationcontrol.common.events import EventSubscriptions
 from tangostationcontrol.common.events import register_subscriptions
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestRegisterSubscriptions(base.TestCase):
-
     def setUp(self):
         super(TestRegisterSubscriptions, self).setUp()
 
diff --git a/tangostationcontrol/test/common/events/test_subscriptions.py b/tests/common/events/test_subscriptions.py
similarity index 98%
rename from tangostationcontrol/test/common/events/test_subscriptions.py
rename to tests/common/events/test_subscriptions.py
index f612f913c221a8b4418c8a4d2eff51671b5a6858..4a24d932d7adce3a461ea07d011c0d4c79a623e4 100644
--- a/tangostationcontrol/test/common/events/test_subscriptions.py
+++ b/tests/common/events/test_subscriptions.py
@@ -3,12 +3,12 @@
 
 from unittest.mock import patch
 
-from test.common.events.mixin import EventSubscriptionMixin
+from tests.common.events.mixin import EventSubscriptionMixin
 
 from tango.server import Device, attribute, AttrWriteType, command
 from tango.test_context import DeviceTestContext
 
-from test import base
+from tests import base
 
 
 class TestEventSubscriptions(EventSubscriptionMixin, base.TestCase):
diff --git a/tangostationcontrol/test/common/fake_measures.ztar b/tests/common/fake_measures.ztar
similarity index 100%
rename from tangostationcontrol/test/common/fake_measures.ztar
rename to tests/common/fake_measures.ztar
diff --git a/tangostationcontrol/test/common/fake_measures_newer.ztar b/tests/common/fake_measures_newer.ztar
similarity index 100%
rename from tangostationcontrol/test/common/fake_measures_newer.ztar
rename to tests/common/fake_measures_newer.ztar
diff --git a/tangostationcontrol/test/change-events/__init__.py b/tests/common/proxy/__init__.py
similarity index 100%
rename from tangostationcontrol/test/change-events/__init__.py
rename to tests/common/proxy/__init__.py
diff --git a/tangostationcontrol/test/common/proxy/test_create_proxies.py b/tests/common/proxy/test_create_proxies.py
similarity index 99%
rename from tangostationcontrol/test/common/proxy/test_create_proxies.py
rename to tests/common/proxy/test_create_proxies.py
index a5c3222f25ea071b0d8c1a4c28686291360ee26d..383421f20530640e6e9aed2de20e8e18236648cc 100644
--- a/tangostationcontrol/test/common/proxy/test_create_proxies.py
+++ b/tests/common/proxy/test_create_proxies.py
@@ -13,13 +13,12 @@ from tangostationcontrol.common.types.device_config_types import (
 )
 from tangostationcontrol.common.proxies import create_proxies
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestCreateProxies(base.TestCase):
-
     def setUp(self):
         super(TestCreateProxies, self).setUp()
 
diff --git a/tangostationcontrol/test/common/proxy/test_proxy.py b/tests/common/proxy/test_proxy.py
similarity index 99%
rename from tangostationcontrol/test/common/proxy/test_proxy.py
rename to tests/common/proxy/test_proxy.py
index 611946418574ced2997bbf32aacb34d4a16df318..8d313c7d921066c0f7e63cf6b197e92ed1f398b8 100644
--- a/tangostationcontrol/test/common/proxy/test_proxy.py
+++ b/tests/common/proxy/test_proxy.py
@@ -8,13 +8,12 @@ from tango import DevSource, AccessControlType
 from tangostationcontrol.common.proxies.proxy import create_device_proxy
 from tangostationcontrol.common.proxies import proxy
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestCreateProxy(base.TestCase):
-
     def setUp(self):
         super(TestCreateProxy, self).setUp()
 
diff --git a/tangostationcontrol/test/common/test_baselines.py b/tests/common/test_baselines.py
similarity index 98%
rename from tangostationcontrol/test/common/test_baselines.py
rename to tests/common/test_baselines.py
index eed7d7dda120a57f69885c7a6f9ffa4f503fac09..2dfa94fa3aff3f158cb7aa4cfa1f612b20562924 100644
--- a/tangostationcontrol/test/common/test_baselines.py
+++ b/tests/common/test_baselines.py
@@ -4,7 +4,7 @@
 from tangostationcontrol.common import baselines
 from tangostationcontrol.common.constants import MAX_INPUTS
 
-from test import base
+from tests import base
 
 
 class TestBaselines(base.TestCase):
diff --git a/tangostationcontrol/test/common/test_cables.py b/tests/common/test_cables.py
similarity index 98%
rename from tangostationcontrol/test/common/test_cables.py
rename to tests/common/test_cables.py
index 0ffc3b55a9e4ea4a7e457db53979034c74d49659..b551d5256458ad09788b5f3be770b998b8e3e886 100644
--- a/tangostationcontrol/test/common/test_cables.py
+++ b/tests/common/test_cables.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.common import cables
 
-from test import base
+from tests import base
 
 
 class TestCables(base.TestCase):
diff --git a/tangostationcontrol/test/common/test_calibration.py b/tests/common/test_calibration.py
similarity index 99%
rename from tangostationcontrol/test/common/test_calibration.py
rename to tests/common/test_calibration.py
index 7b801d6a8eb2a1c23f05400910e7534386db6aa7..8e7091bac789a9d802433e84e51657d763cef2ec 100644
--- a/tangostationcontrol/test/common/test_calibration.py
+++ b/tests/common/test_calibration.py
@@ -3,7 +3,7 @@
 import os
 from os import path
 from unittest.mock import patch, Mock, call, PropertyMock
-from test import base
+from tests import base
 
 import numpy
 from numpy.testing import assert_array_equal
diff --git a/tangostationcontrol/test/common/test_device_decorators.py b/tests/common/test_device_decorators.py
similarity index 99%
rename from tangostationcontrol/test/common/test_device_decorators.py
rename to tests/common/test_device_decorators.py
index 0f8a5279b540e9e6afe4d1d458ac5c191ae97a9b..279983594fe1de63eafb1140b8fcfcddce6ce086 100644
--- a/tangostationcontrol/test/common/test_device_decorators.py
+++ b/tests/common/test_device_decorators.py
@@ -11,7 +11,7 @@ from tangostationcontrol.common.device_decorators import (
     log_exceptions,
 )
 
-from test import base
+from tests import base
 
 
 class TestSuppressExceptions(base.TestCase):
diff --git a/tangostationcontrol/test/common/test_lofar_logging.py b/tests/common/test_lofar_logging.py
similarity index 99%
rename from tangostationcontrol/test/common/test_lofar_logging.py
rename to tests/common/test_lofar_logging.py
index 7e3766e926ac2bfbfd82e3506e7f58be82e415ec..45b0480e82c59ea2dd0c2f1bc5c3afd15353d44b 100644
--- a/tangostationcontrol/test/common/test_lofar_logging.py
+++ b/tests/common/test_lofar_logging.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from test import base
+from tests import base
 from tango import DevFailed
 from tango.test_context import DeviceTestContext
 from tangostationcontrol.common import lofar_logging
diff --git a/tangostationcontrol/test/common/test_sdp.py b/tests/common/test_sdp.py
similarity index 99%
rename from tangostationcontrol/test/common/test_sdp.py
rename to tests/common/test_sdp.py
index a69561ab3807b8f7da790c431df79798287c295f..140567d64f99a9c8aa2607c4ac065ac118609bc0 100644
--- a/tangostationcontrol/test/common/test_sdp.py
+++ b/tests/common/test_sdp.py
@@ -12,7 +12,7 @@ from tangostationcontrol.common.sdp import (
     complex_to_weights,
 )
 
-from test import base
+from tests import base
 
 
 class TestSDPCommon(base.TestCase):
diff --git a/tangostationcontrol/test/common/test_threading.py b/tests/common/test_threading.py
similarity index 97%
rename from tangostationcontrol/test/common/test_threading.py
rename to tests/common/test_threading.py
index 56d937282bcde85884a4ad9512f2f3ebe1c4cf89..0e729cf1dcf8a7a40904f2c9a8a5e844a00100fc 100644
--- a/tangostationcontrol/test/common/test_threading.py
+++ b/tests/common/test_threading.py
@@ -5,7 +5,7 @@ import tango
 
 from tangostationcontrol.common.threading import OmniThread
 
-from test import base
+from tests import base
 
 
 class TestOmniThread(base.TestCase):
diff --git a/tangostationcontrol/test/common/test_type_checking.py b/tests/common/test_type_checking.py
similarity index 98%
rename from tangostationcontrol/test/common/test_type_checking.py
rename to tests/common/test_type_checking.py
index c42b3b00cff92356284fcc40eb37996219cf6c33..12ad690274b86b2faf13752b7e7545576087f4f8 100644
--- a/tangostationcontrol/test/common/test_type_checking.py
+++ b/tests/common/test_type_checking.py
@@ -6,7 +6,7 @@ from tango.utils import is_seq
 
 from tangostationcontrol.common import type_checking
 
-from test import base
+from tests import base
 
 
 class TestTypeChecking(base.TestCase):
diff --git a/tangostationcontrol/test/devices/__init__.py b/tests/configuration/__init__.py
similarity index 100%
rename from tangostationcontrol/test/devices/__init__.py
rename to tests/configuration/__init__.py
diff --git a/tangostationcontrol/test/configuration/test_observation_field_settings.py b/tests/configuration/test_observation_field_settings.py
similarity index 99%
rename from tangostationcontrol/test/configuration/test_observation_field_settings.py
rename to tests/configuration/test_observation_field_settings.py
index 38f374851f32973f4030fd6839eeda97f272dfdc..5a8586474ce63034735f199ff86a004e0e74db38 100644
--- a/tangostationcontrol/test/configuration/test_observation_field_settings.py
+++ b/tests/configuration/test_observation_field_settings.py
@@ -12,7 +12,7 @@ from tangostationcontrol.configuration import (
     XST,
 )
 
-from test import base
+from tests import base
 
 
 class TestObservationFieldSettings(base.TestCase):
diff --git a/tangostationcontrol/test/configuration/test_observation_settings.py b/tests/configuration/test_observation_settings.py
similarity index 99%
rename from tangostationcontrol/test/configuration/test_observation_settings.py
rename to tests/configuration/test_observation_settings.py
index e727d149fbffe3232e7a124a28ee55a149e34221..b3828eddab32175ab439962baaa033881ef4b061 100644
--- a/tangostationcontrol/test/configuration/test_observation_settings.py
+++ b/tests/configuration/test_observation_settings.py
@@ -8,7 +8,7 @@ from tangostationcontrol.configuration import Sap
 from tangostationcontrol.configuration import Pointing
 from tangostationcontrol.configuration import ObservationFieldSettings
 
-from test import base
+from tests import base
 
 
 class TestObservationSettings(base.TestCase):
diff --git a/tangostationcontrol/test/configuration/test_pointing.py b/tests/configuration/test_pointing.py
similarity index 98%
rename from tangostationcontrol/test/configuration/test_pointing.py
rename to tests/configuration/test_pointing.py
index 1c864b99f0d7cbe2839e39c00c6914f72d1c85ca..76c58458b3afa3585987db027240020d1087251b 100644
--- a/tangostationcontrol/test/configuration/test_pointing.py
+++ b/tests/configuration/test_pointing.py
@@ -4,7 +4,7 @@
 from jsonschema.exceptions import ValidationError
 
 from tangostationcontrol.configuration import Pointing
-from test import base
+from tests import base
 
 
 class TestPointing(base.TestCase):
diff --git a/tangostationcontrol/test/configuration/test_sap_settings.py b/tests/configuration/test_sap_settings.py
similarity index 98%
rename from tangostationcontrol/test/configuration/test_sap_settings.py
rename to tests/configuration/test_sap_settings.py
index b013f1feb2f7b7f447404730583ac9002d02cc14..ddc653ddb8c8cdcac9f2bb617fed8315800d7c5e 100644
--- a/tangostationcontrol/test/configuration/test_sap_settings.py
+++ b/tests/configuration/test_sap_settings.py
@@ -4,7 +4,7 @@
 from jsonschema.exceptions import ValidationError
 
 from tangostationcontrol.configuration import Pointing, Sap
-from test import base
+from tests import base
 
 
 class TestSapSettings(base.TestCase):
diff --git a/tangostationcontrol/test/devices/antennafield/__init__.py b/tests/devices/__init__.py
similarity index 100%
rename from tangostationcontrol/test/devices/antennafield/__init__.py
rename to tests/devices/__init__.py
diff --git a/tangostationcontrol/test/devices/base_device_classes/__init__.py b/tests/devices/antennafield/__init__.py
similarity index 100%
rename from tangostationcontrol/test/devices/base_device_classes/__init__.py
rename to tests/devices/antennafield/__init__.py
diff --git a/tangostationcontrol/test/devices/antennafield/test_afh_device.py b/tests/devices/antennafield/test_afh_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/antennafield/test_afh_device.py
rename to tests/devices/antennafield/test_afh_device.py
index 403103990859566186bd625187a4453b72b11225..a537b0214958e9011675baba69298604fc75b88c 100644
--- a/tangostationcontrol/test/devices/antennafield/test_afh_device.py
+++ b/tests/devices/antennafield/test_afh_device.py
@@ -5,8 +5,8 @@
 # pylint: disable=C0103
 
 import logging
-from test import base
-from test.devices import device_base
+from tests import base
+from tests.devices import device_base
 
 import numpy
 from tango.test_context import DeviceTestContext
diff --git a/tangostationcontrol/test/devices/antennafield/test_afl_device.py b/tests/devices/antennafield/test_afl_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/antennafield/test_afl_device.py
rename to tests/devices/antennafield/test_afl_device.py
index b8a602d0f0320e243959455f0c13269dbdad4802..3bb1938b74c292f90da63d563db5a75e668ce36e 100644
--- a/tangostationcontrol/test/devices/antennafield/test_afl_device.py
+++ b/tests/devices/antennafield/test_afl_device.py
@@ -5,7 +5,7 @@
 # pylint: disable=C0103
 
 import logging
-from test import base
+from tests import base
 
 import numpy
 
diff --git a/tangostationcontrol/test/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md b/tests/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md
similarity index 98%
rename from tangostationcontrol/test/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md
rename to tests/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md
index 5f7e4e9afc94b3dc502624650b14b3884f9474a0..94fc0cd0da85b9ba18babb8dc0642ad6fcf553d9 100644
--- a/tangostationcontrol/test/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md
+++ b/tests/devices/automatic_polling_performance_test/Tango_Controls-Automatic_polling_performance_test.md
@@ -19,20 +19,20 @@ Please refer to the reference documents for in-depth information about the autom
 
 - Two devices run in the same DS.
     - Tango DB is modified to have a DS named  `monitoring_performance_test/1`.
-    
+
     - Tango DB is modified to have the DS named `monitoring_performance_test/1` run two devices named `test/monitoring_performance/1` and `test/monitoring_performance/2`. Both devices instantiate the same class `MonitoringPerformanceDevice`.
-    
+
     - Execute the DS like this: `bin/start-DS.sh devices/test/devices/automatic_polling_performance_test/monitoring_performance_test.py 1`
-    
+
     - Get a DeviceProxy object to both devices like this:
-    
+
         ```python
         d1 = DeviceProxy('test/monitoring_performance/1')
         d2 = DeviceProxy('test/monitoring_performance/2')
         ```
-    
+
         This will execute the device code and perform the automatic polling.
-    
+
     - Devices in the appended data (section Data) are labelled d1 and d2.
 - Each device has 4 read-only attributes (MPs) that are arrays with 2e6 doubles.
     - In Tango DB automatic polling every 1s is enabled for each array.
@@ -48,11 +48,11 @@ Please refer to the reference documents for in-depth information about the autom
 - The DS is started manually.
 - The attribute polling resumes automatically as soon as the device state is set to ON in init_device.
 - The test script creates two Python processes that are assigned to one of the two devices each.
-    - The process creates a `DeviceProxy` object for its device and runs 
+    - The process creates a `DeviceProxy` object for its device and runs
     - The process executes `attribute_polling_stats` and the results are printed out.
     - The process exits.
 - The DS is allowed to run for approximately 10 polling iterations.
-    - The DS processes will print statistics about the polling. 
+    - The DS processes will print statistics about the polling.
 - The test is manually stopped and the output copied.
 
 Test results are in the attached file.
@@ -69,7 +69,7 @@ The tests have shown that polling gets significantly delayed under certain circu
 From this finding other reasons that will have a negative impact on polling become immediately obvious and need to be avoided no matter what:
 
 - Fetching data on-the-fly over a slow communication link in an attribute's ` read` function.
-- Fetching a big amount of data on-the-fly over a fast communication link in an attribute's ` read` function. 
+- Fetching a big amount of data on-the-fly over a fast communication link in an attribute's ` read` function.
 - Computing data on-the-fly in an attribute's `read`function.
 
 Adding more polling threads to a DS does not alleviate this situation. The reason lies in the way how Tango Controls polling works. As a default the polling is performed by one thread per DS or, if the polling thread pool size is increased, by at most one thread per device. Adding twice as many polling threads as devices that are running in a DS does not change the situation as the data suggests.
@@ -107,7 +107,7 @@ d1
 	median = 0.7123280000000001[s]
 	mean = 0.7121181[s]
 	stddev = 0.004004320403014733[s]
-	
+
 	Polling delay
 	min = 0.792[s]
 	max = 2.207[s]
@@ -123,7 +123,7 @@ d2
 	median = 0.7069909999999999[s]
 	mean = 0.7061663000000001[s]
 	stddev = 0.00792590103458277[s]
-	
+
 	Polling delay
 	min = 0.744[s]
 	max = 2.245[s]
@@ -141,7 +141,7 @@ d1
 	median = 0.710067[s]
 	mean = 0.7068808[s]
 	stddev = 0.004127314376201529[s]
-	
+
 	Polling delay
 	min = 0.802[s]
 	max = 2.196[s]
@@ -157,7 +157,7 @@ d2
 	median = 0.7044239999999999[s]
 	mean = 0.7036658000000001[s]
 	stddev = 0.0025871636902213896[s]
-	
+
 	Polling delay
 	min = 0.758[s]
 	max = 2.24[s]
@@ -175,7 +175,7 @@ d1
 	median = 0.7119365[s]
 	mean = 0.7107762[s]
 	stddev = 0.008783150821886167[s]
-	
+
 	Polling delay
 	min = 0.79[s]
 	max = 2.209[s]
@@ -191,7 +191,7 @@ d2
 	median = 0.7119840000000001[s]
 	mean = 0.7122735[s]
 	stddev = 0.006137572716473502[s]
-	
+
 	Polling delay
 	min = 0.749[s]
 	max = 2.25[s]
@@ -211,7 +211,7 @@ d1
 	median = 0.0065065[s]
 	mean = 0.006732[s]
 	stddev = 0.0009050982267135427[s]
-	
+
 	Polling delay
 	min = 0.998[s]
 	max = 1.001[s]
@@ -227,7 +227,7 @@ d2
 	median = 0.0069180000000000005[s]
 	mean = 0.0070902[s]
 	stddev = 0.0007260824746542229[s]
-	
+
 	Polling delay
 	min = 0.996[s]
 	max = 1.003[s]
diff --git a/tangostationcontrol/test/devices/automatic_polling_performance_test/automatic_polling_performance_test.json b/tests/devices/automatic_polling_performance_test/automatic_polling_performance_test.json
similarity index 100%
rename from tangostationcontrol/test/devices/automatic_polling_performance_test/automatic_polling_performance_test.json
rename to tests/devices/automatic_polling_performance_test/automatic_polling_performance_test.json
diff --git a/tangostationcontrol/test/devices/automatic_polling_performance_test/monitoring_performance_test.py b/tests/devices/automatic_polling_performance_test/monitoring_performance_test.py
similarity index 99%
rename from tangostationcontrol/test/devices/automatic_polling_performance_test/monitoring_performance_test.py
rename to tests/devices/automatic_polling_performance_test/monitoring_performance_test.py
index 587ef602e94dc3cdc13dffa027203a37c1230e72..5cd12644ffc8f302f1c71c70883cbaa4ec8aad01 100644
--- a/tangostationcontrol/test/devices/automatic_polling_performance_test/monitoring_performance_test.py
+++ b/tests/devices/automatic_polling_performance_test/monitoring_performance_test.py
@@ -4,12 +4,6 @@
 # TODO(Corne): Remove sys.path.append hack once packaging is in place!
 import os
 import sys
-
-currentdir = os.path.dirname(os.path.realpath(__file__))
-parentdir = os.path.dirname(currentdir)
-parentdir = os.path.dirname(parentdir)
-sys.path.append(parentdir)
-
 import time
 import numpy
 from tango import DevState, Util
@@ -17,6 +11,11 @@ from tango.server import run, Device, attribute
 
 __all__ = ["MonitoringPerformanceDevice", "main"]
 
+currentdir = os.path.dirname(os.path.realpath(__file__))
+parentdir = os.path.dirname(currentdir)
+parentdir = os.path.dirname(parentdir)
+sys.path.append(parentdir)
+
 POLLING_THREADS = 100
 ARRAY_SIZE = 2000000
 
diff --git a/tangostationcontrol/test/devices/recv/__init__.py b/tests/devices/base_device_classes/__init__.py
similarity index 100%
rename from tangostationcontrol/test/devices/recv/__init__.py
rename to tests/devices/base_device_classes/__init__.py
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_async_device.py b/tests/devices/base_device_classes/test_async_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/base_device_classes/test_async_device.py
rename to tests/devices/base_device_classes/test_async_device.py
index 1438e9060a14637ad3a145e4cc2549aeaec0a4f6..042e78a2eaf08f23addec81cda969edb55388fdb 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_async_device.py
+++ b/tests/devices/base_device_classes/test_async_device.py
@@ -10,7 +10,7 @@ from tango.test_context import DeviceTestContext
 
 from tangostationcontrol.devices.base_device_classes import async_device
 
-from test.devices.base_device_classes.test_lofar_device import TestLofarDevice
+from tests.devices.base_device_classes.test_lofar_device import TestLofarDevice
 
 
 class TestAsyncDevice(TestLofarDevice):
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_beam_device.py b/tests/devices/base_device_classes/test_beam_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/base_device_classes/test_beam_device.py
rename to tests/devices/base_device_classes/test_beam_device.py
index 0517460b5a25f0c46356bf179c8fc916e112a633..276d011d96ff83efcf453f59392f043e4aa0dd3d 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_beam_device.py
+++ b/tests/devices/base_device_classes/test_beam_device.py
@@ -16,8 +16,8 @@ from tangostationcontrol.common.atomic import Atomic
 from tangostationcontrol.devices.base_device_classes import beam_device
 
 from unittest import mock
-from test import base
-from test.devices import device_base
+from tests import base
+from tests.devices import device_base
 
 logger = logging.getLogger()
 
@@ -97,7 +97,7 @@ class TestBeamTracker(base.TestCase):
         for i in numpy.arange(interval, 0, -step):
             result = t_tracker._get_sleep_time(next_update)
             self.assertTrue(
-                i - step < result < i, f"Result {result} not between {i-step} and {i}"
+                i - step < result < i, f"Result {result} not between {i - step} and {i}"
             )
             time.sleep(step)
 
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_hierarchy_device.py b/tests/devices/base_device_classes/test_hierarchy_device.py
similarity index 97%
rename from tangostationcontrol/test/devices/base_device_classes/test_hierarchy_device.py
rename to tests/devices/base_device_classes/test_hierarchy_device.py
index 1db28e0677c76e40bcb43ca4c6277f1cafc547ab..c30fc799c4906c48977933f323f7fffbcfb0dd66 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_hierarchy_device.py
+++ b/tests/devices/base_device_classes/test_hierarchy_device.py
@@ -5,7 +5,7 @@ import unittest
 from unittest.mock import Mock, patch
 from typing import List, Dict, Callable
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tango import DeviceProxy, DevState
 from tango.server import command
@@ -172,9 +172,9 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
             mock_children[child] = None
         test_hierarchy._children = mock_children
 
-        self.device_proxy_mock["object"].return_value.get_property.side_effect = (
-            children_properties
-        )
+        self.device_proxy_mock[
+            "object"
+        ].return_value.get_property.side_effect = children_properties
 
         fn(test_hierarchy)
 
@@ -200,7 +200,7 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
             # test if for each child there are no further children
             for child in test_children:
                 self.assertEqual(
-                    0, len(test[child]["children"]), msg=f'{test[child]["children"]}'
+                    0, len(test[child]["children"]), msg=f"{test[child]['children']}"
                 )
 
         self.children_test_base(
@@ -231,7 +231,7 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
             self.assertEqual(
                 0,
                 len(test["stat/sdp/1"]["children"]["stat/afl/1"]["children"]),
-                msg=f'{test["stat/sdp/1"]["children"]["stat/afl/1"]["children"]}',
+                msg=f"{test['stat/sdp/1']['children']['stat/afl/1']['children']}",
             )
 
         self.children_test_base(
@@ -332,7 +332,7 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
             self.assertEqual(
                 0,
                 len(test["stat/ccd/1"]["children"]),
-                msg=f'{test["stat/ccd/1"]["children"]}',
+                msg=f"{test['stat/ccd/1']['children']}",
             )
 
             # Test antennafield has 4 children
@@ -400,9 +400,9 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
         test_hierarchy._children = mock_children
         test_hierarchy._parents = None
 
-        self.device_proxy_mock["object"].return_value.get_property.side_effect = (
-            self.TEST_GET_PROPERTY_CALLS
-        )
+        self.device_proxy_mock[
+            "object"
+        ].return_value.get_property.side_effect = self.TEST_GET_PROPERTY_CALLS
 
         all_children = copy.copy(self.TEST_CHILDREN_ROOT)
         all_children.extend(self.TEST_CHILDREN_ANTENNAFIELD)
@@ -417,9 +417,9 @@ class TestHierarchyDevice(device_base.DeviceTestCase):
             )
             self.assertEqual(test_hierarchy._proxies[child], result)
 
-            self.device_proxy_mock["object"].return_value.get_property.side_effect = (
-                self.TEST_GET_PROPERTY_CALLS
-            )
+            self.device_proxy_mock[
+                "object"
+            ].return_value.get_property.side_effect = self.TEST_GET_PROPERTY_CALLS
 
     class FakeDeviceProxy:
         """A stateful fake to return the right values
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_lofar_device.py b/tests/devices/base_device_classes/test_lofar_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/base_device_classes/test_lofar_device.py
rename to tests/devices/base_device_classes/test_lofar_device.py
index 4c000fb120820c0d41406c20d2862abf97ebe95a..102a555546163372ce7431c49eb1656a8edff96b 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_lofar_device.py
+++ b/tests/devices/base_device_classes/test_lofar_device.py
@@ -20,7 +20,7 @@ from tangostationcontrol.metrics import AttributeMetric
 from tangostationcontrol.devices.base_device_classes import lofar_device
 from tangostationcontrol.devices.base_device_classes.async_device import AsyncDevice
 
-from test.devices import device_base
+from tests.devices import device_base
 
 
 class TestAttributePoller(IsolatedAsyncioTestCase):
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_mapper.py b/tests/devices/base_device_classes/test_mapper.py
similarity index 99%
rename from tangostationcontrol/test/devices/base_device_classes/test_mapper.py
rename to tests/devices/base_device_classes/test_mapper.py
index 9dc78b7f2c4a5263a18548e74646d97b115ad1cc..54b50ee305ebcad11a66159e43d2c3e700e85f81 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_mapper.py
+++ b/tests/devices/base_device_classes/test_mapper.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2023 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from test import base
+from tests import base
 import numpy
 
 from tangostationcontrol.common.constants import N_rcu
diff --git a/tangostationcontrol/test/devices/base_device_classes/test_opcua_device.py b/tests/devices/base_device_classes/test_opcua_device.py
similarity index 94%
rename from tangostationcontrol/test/devices/base_device_classes/test_opcua_device.py
rename to tests/devices/base_device_classes/test_opcua_device.py
index cb266b1b3f4a641963be0af737493636c4cb6845..864818dcb026e2cd44bbaf70246c19931cd70553 100644
--- a/tangostationcontrol/test/devices/base_device_classes/test_opcua_device.py
+++ b/tests/devices/base_device_classes/test_opcua_device.py
@@ -12,8 +12,8 @@ from attribute_wrapper.attribute_wrapper import AttributeWrapper
 
 from tangostationcontrol.devices.base_device_classes import opcua_device
 
-from test.devices import device_base
-from test.opcua import RunOPCUAServer
+from tests.devices import device_base
+from tests.opcua import RunOPCUAServer
 
 logger = logging.getLogger()
 
@@ -56,7 +56,7 @@ class RunOPCUADevice(device_base.DeviceTestCase):
         with DeviceTestContext(
             self.TestDevice, properties=self.TestDevice.PROPERTIES, process=True
         ) as proxy:
-            with RunOPCUAServer(12345, "http://lofar.eu") as opcua_server:
+            with RunOPCUAServer(12345, "http://lofar.eu"):
                 proxy.initialise()
 
             while proxy.connected_R:
diff --git a/tangostationcontrol/test/devices/device_base.py b/tests/devices/device_base.py
similarity index 98%
rename from tangostationcontrol/test/devices/device_base.py
rename to tests/devices/device_base.py
index 3f8ab91a5f8ee70eeec79ecd294fd149da0aa573..eeed89d6c2799ad76796e00cddfdade35f819132 100644
--- a/tangostationcontrol/test/devices/device_base.py
+++ b/tests/devices/device_base.py
@@ -4,7 +4,7 @@
 from tangostationcontrol.common.proxies import proxy
 from tangostationcontrol.devices.base_device_classes import hierarchy_device
 
-from test import base
+from tests import base
 
 
 class DeviceTestCase(base.TestCase):
diff --git a/tangostationcontrol/test/devices/random_data.py b/tests/devices/random_data.py
similarity index 100%
rename from tangostationcontrol/test/devices/random_data.py
rename to tests/devices/random_data.py
diff --git a/tangostationcontrol/test/toolkit/__init__.py b/tests/devices/recv/__init__.py
similarity index 100%
rename from tangostationcontrol/test/toolkit/__init__.py
rename to tests/devices/recv/__init__.py
diff --git a/tangostationcontrol/test/devices/recv/test_recv_device.py b/tests/devices/recv/test_recv_device.py
similarity index 97%
rename from tangostationcontrol/test/devices/recv/test_recv_device.py
rename to tests/devices/recv/test_recv_device.py
index 7d3004187193f4363188929b99cedd7db482aba9..48d15bcd4563c40cfbd9b46abe49826bb2c06521 100644
--- a/tangostationcontrol/test/devices/recv/test_recv_device.py
+++ b/tests/devices/recv/test_recv_device.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from test.devices import device_base
+from tests.devices import device_base
 import numpy
 from tango.test_context import DeviceTestContext
 from tango import DevFailed
diff --git a/tangostationcontrol/test/common/events/__init__.py b/tests/devices/sdp/__init__.py
similarity index 100%
rename from tangostationcontrol/test/common/events/__init__.py
rename to tests/devices/sdp/__init__.py
diff --git a/tangostationcontrol/test/devices/sdp/test_beamlet_device.py b/tests/devices/sdp/test_beamlet_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/sdp/test_beamlet_device.py
rename to tests/devices/sdp/test_beamlet_device.py
index 3dc32d764129ed3b914283867e8b51d0e2b6de4e..88d3a7877a206e45dad567a8eb4124d2eebf64d3 100644
--- a/tangostationcontrol/test/devices/sdp/test_beamlet_device.py
+++ b/tests/devices/sdp/test_beamlet_device.py
@@ -16,7 +16,7 @@ from tangostationcontrol.common.constants import (
 from tangostationcontrol.common.sdp import weight_to_complex
 from tangostationcontrol.devices.sdp.beamlet import Beamlet
 
-from test import base
+from tests import base
 
 
 class TestBeamletDevice(base.TestCase):
diff --git a/tangostationcontrol/test/devices/sdp/test_bst_device.py b/tests/devices/sdp/test_bst_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/sdp/test_bst_device.py
rename to tests/devices/sdp/test_bst_device.py
index 30cfec4745496e3b4dcbee84d9143290b284f3cc..dea708c8c1685940937ed2cca669258ca217257c 100644
--- a/tangostationcontrol/test/devices/sdp/test_bst_device.py
+++ b/tests/devices/sdp/test_bst_device.py
@@ -10,7 +10,7 @@ from unittest.mock import patch
 
 from tango.test_context import DeviceTestContext
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tangostationcontrol.common.constants import N_beamlets_max, N_pol
 from tangostationcontrol.devices.sdp.bst import BST
diff --git a/tangostationcontrol/test/devices/sdp/test_digitalbeam_device.py b/tests/devices/sdp/test_digitalbeam_device.py
similarity index 87%
rename from tangostationcontrol/test/devices/sdp/test_digitalbeam_device.py
rename to tests/devices/sdp/test_digitalbeam_device.py
index 473f62f3dd107f5d43bc436a04f52391020279ce..8e41192f311c8531da49461b46e49a9194cb0467 100644
--- a/tangostationcontrol/test/devices/sdp/test_digitalbeam_device.py
+++ b/tests/devices/sdp/test_digitalbeam_device.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Internal test imports
-from test.devices import device_base
+from tests.devices import device_base
 
 
 class TestDigitalBeamDevice(device_base.DeviceTestCase):
diff --git a/tangostationcontrol/test/devices/sdp/test_sdp_device.py b/tests/devices/sdp/test_sdp_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/sdp/test_sdp_device.py
rename to tests/devices/sdp/test_sdp_device.py
index 4b8388cc651ebe9e7ac50c442847b97c765f902a..f304ab5fc42393cf03bc9a83689c3017c125f4d4 100644
--- a/tangostationcontrol/test/devices/sdp/test_sdp_device.py
+++ b/tests/devices/sdp/test_sdp_device.py
@@ -5,7 +5,7 @@ import numpy
 import numpy.testing
 
 # Internal test imports
-from test.devices import device_base
+from tests.devices import device_base
 
 from tangostationcontrol.common.constants import (
     CLK_160_MHZ,
diff --git a/tangostationcontrol/test/devices/sdp/test_sst_device.py b/tests/devices/sdp/test_sst_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/sdp/test_sst_device.py
rename to tests/devices/sdp/test_sst_device.py
index d468fd4ff282bb7630104df9e7742bb630e9cc97..07a2ae3dcb14ea9c2783057b0333449f42ca0058 100644
--- a/tangostationcontrol/test/devices/sdp/test_sst_device.py
+++ b/tests/devices/sdp/test_sst_device.py
@@ -10,7 +10,7 @@ from unittest.mock import patch
 
 from tango.test_context import DeviceTestContext
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tangostationcontrol.common.constants import MAX_INPUTS, N_subbands
 from tangostationcontrol.devices.sdp.sst import SST
diff --git a/tangostationcontrol/test/devices/sdp/test_statistics_device.py b/tests/devices/sdp/test_statistics_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/sdp/test_statistics_device.py
rename to tests/devices/sdp/test_statistics_device.py
index a7262a74eabacf1c27375e8a0b79e7c58bf54531..0ae4eb68fe4b1f738615d766ac484634dd53d5e2 100644
--- a/tangostationcontrol/test/devices/sdp/test_statistics_device.py
+++ b/tests/devices/sdp/test_statistics_device.py
@@ -10,7 +10,7 @@ from unittest.mock import patch
 from tango import server
 from tango.test_context import DeviceTestContext
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tangostationcontrol.devices.sdp.statistics import Statistics
 
diff --git a/tangostationcontrol/test/devices/sdp/test_xst_device.py b/tests/devices/sdp/test_xst_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/sdp/test_xst_device.py
rename to tests/devices/sdp/test_xst_device.py
index 3994ecf9bed8f23bcfecdc127181c04fda5dece6..4861235b5ae6d8ad024d33f4244000cd8ecb6f58 100644
--- a/tangostationcontrol/test/devices/sdp/test_xst_device.py
+++ b/tests/devices/sdp/test_xst_device.py
@@ -10,7 +10,7 @@ from unittest.mock import patch
 
 from tango.test_context import DeviceTestContext
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tangostationcontrol.common.constants import MAX_INPUTS
 from tangostationcontrol.devices.sdp.xst import XST
diff --git a/tangostationcontrol/test/devices/test_metadata_device.py b/tests/devices/test_metadata_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/test_metadata_device.py
rename to tests/devices/test_metadata_device.py
index 7302e08c162792b3b7fa47ff3f47de67aefc0e44..bc3f63bfc0cafe2ce22ce466a47883ebe37ee47b 100644
--- a/tangostationcontrol/test/devices/test_metadata_device.py
+++ b/tests/devices/test_metadata_device.py
@@ -11,12 +11,11 @@ from tango.test_context import DeviceTestContext
 from tangostationcontrol.devices.base_device_classes import lofar_device
 from tangostationcontrol.devices import metadata
 
-from test.devices import device_base
+from tests.devices import device_base
 
 
 @patch("tango.Database")
 class TestMetadataDevice(device_base.DeviceTestCase):
-
     TEST_PROPERTIES = {
         "metadata_port": "6001",
     }
diff --git a/tangostationcontrol/test/devices/test_observation_control.py b/tests/devices/test_observation_control.py
similarity index 97%
rename from tangostationcontrol/test/devices/test_observation_control.py
rename to tests/devices/test_observation_control.py
index 4959a7a093f698d00b4d59732b7005a5a22645f8..04ef4a6bb81e00116d95abf9a3df2ccb810c010b 100644
--- a/tangostationcontrol/test/devices/test_observation_control.py
+++ b/tests/devices/test_observation_control.py
@@ -10,7 +10,7 @@ from tangostationcontrol.devices import observation_control
 from tangostationcontrol.devices.base_device_classes import lofar_device
 from tangostationcontrol.observation import observation_controller
 
-from test.devices import device_base
+from tests.devices import device_base
 
 
 class TestObservationControlDevice(device_base.DeviceTestCase):
diff --git a/tangostationcontrol/test/devices/test_protection_control_device.py b/tests/devices/test_protection_control_device.py
similarity index 98%
rename from tangostationcontrol/test/devices/test_protection_control_device.py
rename to tests/devices/test_protection_control_device.py
index 70b6f65e252cd61ab12e3f698e81c9e07e823669..f98bee1b86eb7063c8092a28ee91a94feb0a2bfa 100644
--- a/tangostationcontrol/test/devices/test_protection_control_device.py
+++ b/tests/devices/test_protection_control_device.py
@@ -11,7 +11,7 @@ from tangostationcontrol.common.constants import DEFAULT_POLLING_PERIOD_MS
 from tangostationcontrol.devices import protection_control
 from tangostationcontrol.protection.state import ProtectionStateEnum
 
-from test.devices import device_base
+from tests.devices import device_base
 
 
 @patch("tango.Database")
@@ -38,13 +38,11 @@ class TestProtectionControlDevice(device_base.DeviceTestCase):
             self.assertTrue(proxy.protection_monitor_thread_running_R)
 
     def test_protection_control_state(self, _database):
-
         with DeviceTestContext(
             protection_control.ProtectionControl,
             process=False,
             timeout=10,
         ) as proxy:
-
             self.assertEqual(ProtectionStateEnum.DEACTIVATED, proxy.protection_state_R)
 
             proxy.initialise()
@@ -78,7 +76,6 @@ class TestProtectionControlDevice(device_base.DeviceTestCase):
             process=False,
             timeout=10,
         ) as proxy:
-
             proxy.initialise()
             proxy.on()
 
@@ -102,7 +99,6 @@ class TestProtectionControlDevice(device_base.DeviceTestCase):
                 process=False,
                 timeout=10,
             ) as proxy:
-
                 proxy.initialise()
                 proxy.on()
 
diff --git a/tangostationcontrol/test/devices/test_station_manager_device.py b/tests/devices/test_station_manager_device.py
similarity index 99%
rename from tangostationcontrol/test/devices/test_station_manager_device.py
rename to tests/devices/test_station_manager_device.py
index 520e061573a2d07a4f8f049231ecc17507bad076..6bbcf304bf419e2ccb5817890ac83a72e829aa60 100644
--- a/tangostationcontrol/test/devices/test_station_manager_device.py
+++ b/tests/devices/test_station_manager_device.py
@@ -8,7 +8,7 @@ import pytest
 
 from unittest import mock
 
-from test.devices import device_base
+from tests.devices import device_base
 
 from tango import DevState, DevFailed
 from tango.test_context import DeviceTestContext
diff --git a/tangostationcontrol/test/common/proxy/__init__.py b/tests/metadata/__init__.py
similarity index 100%
rename from tangostationcontrol/test/common/proxy/__init__.py
rename to tests/metadata/__init__.py
diff --git a/tangostationcontrol/test/metadata/test_metadata_organizer.py b/tests/metadata/test_metadata_organizer.py
similarity index 99%
rename from tangostationcontrol/test/metadata/test_metadata_organizer.py
rename to tests/metadata/test_metadata_organizer.py
index 7d737a2c4b926667db4e4f1d97cc555412334928..50042e418ff5d777ff5ffc33f97854fe6a0c131f 100644
--- a/tangostationcontrol/test/metadata/test_metadata_organizer.py
+++ b/tests/metadata/test_metadata_organizer.py
@@ -16,14 +16,13 @@ from tangostationcontrol.common.lofar_logging import exception_to_str
 from tangostationcontrol.common.proxies import create_proxies
 from tangostationcontrol.metadata import metadata_organizer
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 @patch("tango.Database")
 class TestMetadataOrganizer(base.TestCase):
-
     def setUp(self):
         super(TestMetadataOrganizer, self).setUp()
 
diff --git a/tangostationcontrol/test/devices/sdp/__init__.py b/tests/metrics/__init__.py
similarity index 100%
rename from tangostationcontrol/test/devices/sdp/__init__.py
rename to tests/metrics/__init__.py
diff --git a/tangostationcontrol/test/metrics/test_metrics.py b/tests/metrics/test_metrics.py
similarity index 99%
rename from tangostationcontrol/test/metrics/test_metrics.py
rename to tests/metrics/test_metrics.py
index db7fea6ba183fa0365317ea3fb31371a0fda42be..7f69f312289388bfcbf2bb545399099683e8110f 100644
--- a/tangostationcontrol/test/metrics/test_metrics.py
+++ b/tests/metrics/test_metrics.py
@@ -27,7 +27,7 @@ from tangostationcontrol.metrics import (
 )
 from tangostationcontrol.metrics._metrics import wrap_method
 
-from test import base
+from tests import base
 
 
 def parse_prometheus_response(prometheus_response: str) -> Dict[str, float]:
diff --git a/tangostationcontrol/test/metadata/__init__.py b/tests/observation/__init__.py
similarity index 100%
rename from tangostationcontrol/test/metadata/__init__.py
rename to tests/observation/__init__.py
diff --git a/tangostationcontrol/test/observation/test_observation.py b/tests/observation/test_observation.py
similarity index 99%
rename from tangostationcontrol/test/observation/test_observation.py
rename to tests/observation/test_observation.py
index 7ada08ce2ae52a560d23d0476b4c19d33129128d..e56f6c5a7d14b26191fec44612247e5b0d21f7ef 100644
--- a/tangostationcontrol/test/observation/test_observation.py
+++ b/tests/observation/test_observation.py
@@ -13,7 +13,7 @@ from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_hba_core_immediate,
 )
 
-from test import base
+from tests import base
 
 
 @mock.patch("tango.Util.instance")
diff --git a/tangostationcontrol/test/observation/test_observation_controller.py b/tests/observation/test_observation_controller.py
similarity index 99%
rename from tangostationcontrol/test/observation/test_observation_controller.py
rename to tests/observation/test_observation_controller.py
index e7178393f5425618b82b529b9f6dfcce37c0381d..d06846d19a96cda6ad8d347937643adf227a4f2b 100644
--- a/tangostationcontrol/test/observation/test_observation_controller.py
+++ b/tests/observation/test_observation_controller.py
@@ -13,7 +13,7 @@ from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_two_fields_core,
 )
 
-from test import base
+from tests import base
 
 
 @mock.patch("tango.Util.instance")
diff --git a/tangostationcontrol/test/observation/test_observation_field.py b/tests/observation/test_observation_field.py
similarity index 99%
rename from tangostationcontrol/test/observation/test_observation_field.py
rename to tests/observation/test_observation_field.py
index 0cb841391e0fa3f2930ae04c0ef348b964ea6288..e29d26bf872805583d10f5e7a4fd6d4c229e5735 100644
--- a/tangostationcontrol/test/observation/test_observation_field.py
+++ b/tests/observation/test_observation_field.py
@@ -14,7 +14,7 @@ from tangostationcontrol.test.dummy_observation_settings import (
     get_observation_settings_two_fields_core,
 )
 
-from test import base
+from tests import base
 
 
 @mock.patch("tango.Util.instance")
diff --git a/tangostationcontrol/test/opcua.py b/tests/opcua.py
similarity index 100%
rename from tangostationcontrol/test/opcua.py
rename to tests/opcua.py
diff --git a/tangostationcontrol/test/metrics/__init__.py b/tests/protection/__init__.py
similarity index 100%
rename from tangostationcontrol/test/metrics/__init__.py
rename to tests/protection/__init__.py
diff --git a/tangostationcontrol/test/protection/test_config_types.py b/tests/protection/test_config_types.py
similarity index 99%
rename from tangostationcontrol/test/protection/test_config_types.py
rename to tests/protection/test_config_types.py
index b2cb330774228ac400dd166f6d4292fa35760dca..ebad15da457539a7a893c1d10ff42ef993120c7e 100644
--- a/tangostationcontrol/test/protection/test_config_types.py
+++ b/tests/protection/test_config_types.py
@@ -17,13 +17,12 @@ from tangostationcontrol.protection.config_types import (
 )
 from tangostationcontrol.protection.threshold import NumberProtectionThreshold
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestConfigTypes(base.TestCase):
-
     TEST_CONFIG: protection_config_type = CaseInsensitiveDict(
         {
             "DEVICE_1": CaseInsensitiveDict(
diff --git a/tangostationcontrol/test/protection/test_metrics.py b/tests/protection/test_metrics.py
similarity index 99%
rename from tangostationcontrol/test/protection/test_metrics.py
rename to tests/protection/test_metrics.py
index b43389e1aef69c8f26e746c640a26a77be8604a8..ff5f5a4d2a59a3e02bb8bf7e02f8212e7ff35aa6 100644
--- a/tangostationcontrol/test/protection/test_metrics.py
+++ b/tests/protection/test_metrics.py
@@ -12,13 +12,12 @@ from tangostationcontrol.protection.config_types import (
 )
 from tangostationcontrol.protection.metrics import ProtectionMetrics
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestProtectionMetrics(base.TestCase):
-
     TEST_MAPPING: protection_metric_mapping_type = CaseInsensitiveDict(
         {
             "stat/device_1/1": CaseInsensitiveDict(
@@ -70,7 +69,6 @@ class TestProtectionMetrics(base.TestCase):
         self.assertEqual(2, t_metrics.number_of_connected_devices)
 
     def test_update_change_event(self):
-
         t_metrics = ProtectionMetrics(self.TEST_MAPPING)
 
         t_first_device = list(self.TEST_MAPPING.keys())[0]
diff --git a/tangostationcontrol/test/protection/test_protection_manager.py b/tests/protection/test_protection_manager.py
similarity index 99%
rename from tangostationcontrol/test/protection/test_protection_manager.py
rename to tests/protection/test_protection_manager.py
index eaeed73c8bfc99d97b216807474549e961871e17..462013940af5190d00b060a94f7db2def5b2d7e8 100644
--- a/tangostationcontrol/test/protection/test_protection_manager.py
+++ b/tests/protection/test_protection_manager.py
@@ -18,13 +18,12 @@ from tangostationcontrol.protection import protection_manager
 from tangostationcontrol.protection.protection_manager import ProtectionManager
 from tangostationcontrol.protection.state import ProtectionStateEnum
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestProtectionManager(base.TestCase):
-
     def setUp(self):
         super(TestProtectionManager, self).setUp()
 
diff --git a/tangostationcontrol/test/protection/test_threshold.py b/tests/protection/test_threshold.py
similarity index 99%
rename from tangostationcontrol/test/protection/test_threshold.py
rename to tests/protection/test_threshold.py
index 7c958e0411aa5d2852ea6d4857d13f08d1c15e42..10a862fa745c810a499e8262cdc7d29199256071 100644
--- a/tangostationcontrol/test/protection/test_threshold.py
+++ b/tests/protection/test_threshold.py
@@ -8,13 +8,12 @@ import numpy
 from tangostationcontrol.states.station_state_enum import StationStateEnum
 from tangostationcontrol.protection.threshold import NumberProtectionThreshold
 
-from test import base
+from tests import base
 
 logger = logging.getLogger()
 
 
 class TestProtectionThreshold(base.TestCase):
-
     def setUp(self):
         super(TestProtectionThreshold, self).setUp()
 
diff --git a/tangostationcontrol/test-requirements.txt b/tests/requirements.txt
similarity index 100%
rename from tangostationcontrol/test-requirements.txt
rename to tests/requirements.txt
diff --git a/tangostationcontrol/test/rpc/bst-message.json b/tests/rpc/bst-message.json
similarity index 100%
rename from tangostationcontrol/test/rpc/bst-message.json
rename to tests/rpc/bst-message.json
diff --git a/tangostationcontrol/test/rpc/sst-message.json b/tests/rpc/sst-message.json
similarity index 100%
rename from tangostationcontrol/test/rpc/sst-message.json
rename to tests/rpc/sst-message.json
diff --git a/tangostationcontrol/test/rpc/test_antennafield.py b/tests/rpc/test_antennafield.py
similarity index 98%
rename from tangostationcontrol/test/rpc/test_antennafield.py
rename to tests/rpc/test_antennafield.py
index 8bfb89204d1a1bebf7f0b44a63dd60fe65c684ef..1d53edb30816406d952a631b304518e7a7fea58a 100644
--- a/tangostationcontrol/test/rpc/test_antennafield.py
+++ b/tests/rpc/test_antennafield.py
@@ -2,18 +2,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest.mock import MagicMock, patch
-from tangostationcontrol.rpc._proto.antennafield_pb2 import (
+from lofar_sid.interface.stationcontrol.antennafield_pb2 import (
     Identifier,
     SetAntennaStatusRequest,
     SetAntennaUseRequest,
 )
 from tangostationcontrol.rpc.antennafield import AntennaField, AntennaNotFoundException
 
-from test import base
+from tests import base
 
 
 class TestAntennaField(base.TestCase):
-
     def mock_tango_db_response(self, mock_tango_database):
         """Helper function to mock Tango database response."""
         mock_db = MagicMock()
@@ -112,7 +111,6 @@ class TestAntennaField(base.TestCase):
     @patch("tangostationcontrol.rpc.antennafield.create_device_proxy")
     @patch("tangostationcontrol.rpc.antennafield.tango.Database")
     def test_set_antenna_status(self, mock_tango_database, mock_create_device_proxy):
-
         # Arrange
         self.mock_tango_db_response(mock_tango_database)
 
diff --git a/tangostationcontrol/test/rpc/test_grafana_apiv3.py b/tests/rpc/test_grafana_apiv3.py
similarity index 98%
rename from tangostationcontrol/test/rpc/test_grafana_apiv3.py
rename to tests/rpc/test_grafana_apiv3.py
index b57f11ac6b2f99dc3cd68a90a70895b2b59b3409..2251a834bcfb5f9bcf6cbbb2a039e659d7ac1ed2 100644
--- a/tangostationcontrol/test/rpc/test_grafana_apiv3.py
+++ b/tests/rpc/test_grafana_apiv3.py
@@ -20,18 +20,18 @@ from tangostationcontrol.rpc.grafana_api import (
     SstToGrafana,
     XstToGrafana,
 )
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2
+from lofar_sid.interface.opah import grafana_apiv3_pb2
 from tangostationcontrol.rpc.statistics import (
     Statistics,
     dB,
     NotAvailableError,
     TooOldError,
 )
-from tangostationcontrol.rpc._proto import statistics_pb2
+from lofar_sid.interface.stationcontrol import statistics_pb2
 
 from google.protobuf.timestamp_pb2 import Timestamp
 
-from test import base
+from tests import base
 
 
 def field_labels(label_list: list[grafana_apiv3_pb2.Label]) -> dict[str, str]:
diff --git a/tangostationcontrol/test/rpc/test_messagehandler.py b/tests/rpc/test_messagehandler.py
similarity index 98%
rename from tangostationcontrol/test/rpc/test_messagehandler.py
rename to tests/rpc/test_messagehandler.py
index 21ff2229456ce8c092a62228b88a4478f4348f41..bc6272220167ad9e03689f66a19962f198c68c10 100644
--- a/tangostationcontrol/test/rpc/test_messagehandler.py
+++ b/tests/rpc/test_messagehandler.py
@@ -8,7 +8,7 @@ from lofar_lotus.zeromq import ZeroMQPublisher
 
 from tangostationcontrol.rpc.messagehandler import MultiEndpointZMQMessageHandler
 
-from test import base
+from tests import base
 
 
 class TestMultiEndpointZMQMessageHandler(base.TestCase):
diff --git a/tangostationcontrol/test/rpc/test_observation.py b/tests/rpc/test_observation.py
similarity index 94%
rename from tangostationcontrol/test/rpc/test_observation.py
rename to tests/rpc/test_observation.py
index 2da9fba52c5818c5f7731cb58a2d0b31f0c3d665..3160cff396424814182367c36b2f5f4a4b8b9c00 100644
--- a/tangostationcontrol/test/rpc/test_observation.py
+++ b/tests/rpc/test_observation.py
@@ -4,9 +4,9 @@
 from unittest import mock
 
 from tangostationcontrol.rpc.observation import Observation
-from tangostationcontrol.rpc._proto import observation_pb2
+from lofar_sid.interface.stationcontrol import observation_pb2
 
-from test import base
+from tests import base
 
 
 class TestObservation(base.TestCase):
diff --git a/tangostationcontrol/test/rpc/test_server.py b/tests/rpc/test_server.py
similarity index 91%
rename from tangostationcontrol/test/rpc/test_server.py
rename to tests/rpc/test_server.py
index 73bda154167c53fb83bdbed76a7ee7de49ddb26f..0d3f4e2d4e066aae3000518e167cecc1a0371f39 100644
--- a/tangostationcontrol/test/rpc/test_server.py
+++ b/tests/rpc/test_server.py
@@ -8,11 +8,11 @@ from grpc_reflection.v1alpha.proto_reflection_descriptor_database import (
     ProtoReflectionDescriptorDatabase,
 )
 
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2
-from tangostationcontrol.rpc._proto import grafana_apiv3_pb2_grpc
+from lofar_sid.interface.opah import grafana_apiv3_pb2
+from lofar_sid.interface.opah import grafana_apiv3_pb2_grpc
 from tangostationcontrol.rpc.server import Server
 
-from test import base
+from tests import base
 
 
 class TestServer(base.TestCase):
diff --git a/tangostationcontrol/test/rpc/test_statistics.py b/tests/rpc/test_statistics.py
similarity index 97%
rename from tangostationcontrol/test/rpc/test_statistics.py
rename to tests/rpc/test_statistics.py
index 141aebb52f1e454f59bf91f94640059c74dc9457..7d2fd3ad942b7d6221275f830633c0a78aa5a3d7 100644
--- a/tangostationcontrol/test/rpc/test_statistics.py
+++ b/tests/rpc/test_statistics.py
@@ -20,9 +20,9 @@ from tangostationcontrol.rpc.statistics import (
     TooOldError,
     NotAvailableError,
 )
-from tangostationcontrol.rpc._proto import statistics_pb2
+from lofar_sid.interface.stationcontrol import statistics_pb2
 
-from test import base
+from tests import base
 
 
 class TestStatistics(base.TestCase):
@@ -48,7 +48,8 @@ class TestStatistics(base.TestCase):
 
         # request/response
         request = statistics_pb2.SstRequest(
-            antenna_field="lba", maxage=1  # sample file surely expired by now
+            antenna_field="lba",
+            maxage=1,  # sample file surely expired by now
         )
 
         with self.assertRaises(TooOldError):
diff --git a/tangostationcontrol/test/rpc/xst-message.json b/tests/rpc/xst-message.json
similarity index 100%
rename from tangostationcontrol/test/rpc/xst-message.json
rename to tests/rpc/xst-message.json
diff --git a/tangostationcontrol/setup.py b/tests/toolkit/__init__.py
similarity index 73%
rename from tangostationcontrol/setup.py
rename to tests/toolkit/__init__.py
index 50e272e92058ab05ab9454d8e78ada8de374fcc4..68ddd5cdc3efaa38e853aef337c08beb99c50c4c 100644
--- a/tangostationcontrol/setup.py
+++ b/tests/toolkit/__init__.py
@@ -1,6 +1,2 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
-
-import setuptools
-
-setuptools.setup()
diff --git a/tangostationcontrol/test/toolkit/test_analyse_dsconfig_hierarchies.py b/tests/toolkit/test_analyse_dsconfig_hierarchies.py
similarity index 99%
rename from tangostationcontrol/test/toolkit/test_analyse_dsconfig_hierarchies.py
rename to tests/toolkit/test_analyse_dsconfig_hierarchies.py
index 53d8aec55877926e940b1f33d35becbf1ee93d72..dda016348819e81cfcfda5261e757af38387c3a9 100644
--- a/tangostationcontrol/test/toolkit/test_analyse_dsconfig_hierarchies.py
+++ b/tests/toolkit/test_analyse_dsconfig_hierarchies.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: Apache-2.0
 
-from test import base
+from tests import base
 from tangostationcontrol.toolkit.analyse_dsconfig_hierarchies import DsConfigAnalysis