some code improvements #8

Closed krausma-4 closed 4 years ago