Fix cookie expire.
Fix cookie removal
Formatting clean up