[TASK] Use intermeditate vars for function returns