...
Refactoring code.
Cleanup.