Give up on some refactoring decisions
Heuristics changes