Formatting + added heuristics