Reduce code-duplication