Cleaned up all the code.

Cleaned up all the code.