[Refactor] Simplified logic