Formatted and clean up.
Fixed the stupid stuff I just comitted.
Remvoed unnecessary delete.