Clean up Queue.php class
Update Observer.php to merge events in the Queue when the customer logins