refactorings from active code review of PR 914#916

khellang merged 1 commit into

scriptcs:devscriptcs/scriptcs:devfrom

adamralph:914-active-reviewCopy head branch name to clipboard