Code Clean Update