Refactoring
Heuristics improvements