[Hoang Nguyen] Clean-up source code.

[Hoang Nguyen] Clean-up source code.