[PiePlot] - Using cleaner orNotation

Strictly a clean refactor
Maybe @bluong cut this branch before the metadata stuff merged to **develop**