Code cleaning. Sugiyama tweak.