Issue #2962743 by jochemvn, bramtenhove: Add dependency injection; Rename long vars; Change current user check to node owner check