Merge branch '4-clean-up-code' into '5-add-unit-tests'

4 clean up code

See merge request !3
2 jobs for 5-add-unit-tests in 1 minute and 4 seconds (queued for 3 seconds)
latest
Status Name Job ID Coverage
  Test
passed test:pylint #51210

00:00:55

passed test:unittest #51211

00:01:04