[CLEAN] Simplify code