Heat map directive re factored