Cleaned up the code.

Cleaned up the code.