Unsubscribe option. Some code refactor