Performance investigation and refactoring #102

Closed kspurgin closed 3 years ago