Solve some normalisation issue and removed some undefined.