Added unsubscribe functionality
Also updated some comments