Code tidy up

Added this. to heuristics
Made methods private