First code cleaning in 1.4.