Fix Cookie-Parser
A bit of refactoring & cleanup
More Cleanup