TASK: Remove local variable

* As we can use returns instead of local variable.
* This will make it easier to see the return value of the method.