[UPDATE] Some cleanup after do some magic