Another clean + finished: TODO: improve this code by iteration

Signed-off-by: Noah1911 <Noah1911x@gmail.com>