Merge pull request #2591 from alex/reduce-duplication

Reduce duplication, write a function