Merge pull request #1718 from marcofranssen/fix-dupl-lint

Resolve some duplicate code linter warnings

Author: marcofranssen