Code Clean
Some changes