Feature/refactors #32

Closed neriat closed 3 years ago