Feature/refactoring #43

Closed gboder closed 1 year ago