adding unsubscribe & documenting code