Cookie management - Transfactoring

Cookie management