Code cleaning.

Code cleaning.