code cleanup #37

Closed misha-ignatenko closed 2 years ago