Code cleanning and begin properly the TD