Code cleanning