Code cleanning
Fixed material