[CLEANUP] Tackled next TODO