Addressing code review feedback.
Simplified logic.
Removed task syntax.
Made code more readable.