[TASK] Reduce cyclomatic complexity for findDemanded() - Closes #122