Cleaning up the code.
Cleaning up the code.