NOJIRA: code cleanup, also one small fix to hierarchyViewer