Fix for graph labels and block evaluation height graph - refs CT#7383
Minor - Improve code style - refs CT#7383
Merge pull request #436 from danbarretodev/CT7383

Fix CT#7383