Refactor/DRY results partial