Revert "Performance refactoring"
Merge pull request #4 from timeinvariant/revert-3-performance-refactoring

Revert "Performance refactoring"