a big refactoring.
CPU usage dropped down by 20%