- refactor heuristics