Tweaks for linter
Merge branch 'develop' into issue-1-reordering